Merge branch '3.0-gem' of github.com:zurb/foundation into 3.0-gem

diff --cc marketing/docs/gem-install.php
Simple merge

diff --cc marketing/docs/grid.php
Simple merge

diff --cc marketing/docs/includes/_documentation_head.php
Simple merge

diff --cc marketing/docs/index.php
index 00b120393bb622388d238229a78b105c7e6a8a55,d2742e8fb53675d92611b7f553f925881ec1eb74..5b7088104f55ade441edfc0a3c3bef6e6c2ad83f
--- 1/marketing/docs/index.php
--- 2/marketing/docs/index.php
+++ b/marketing/docs/index.php
@@@ -36,11 -36,11 +36,11 @@@
  
                                <h4><a href="buttons.php">Buttons</a></h4>
                                <p>Buttons are one of the core interactive elements of the Web. We've included styles and patterns for buttons that make it simple to create everything from simple marketing CTAs to complex application toolbars.</p>
-                               
+ 
                          <h4><a href="forms.php">Forms</a></h4>
 -                        <p>A combination of robust, extensible form styles and the built-in power of the Foundation Grid means you can create simple or complicated forms quickly and easily. Validation states, custom select and radio buttons and more are included.</p>
 +                        <p>A combination of robust, extensible form styles and the built-in power of the Foundation Grid means you can create simple or complicated forms quickly and easily; validation states, custom select and radio buttons and more are included.</p>
                                </div>
-                               
+ 
                                <div class="six columns">
                          <h4><a href="navigation.php">Navigation</a></h4>
                          <p>People have to get around. Navigation styles in Foundation include simple top bars, sidebars, and subnav pills. We've also included a crazy powerful, responsive top bar that supports N-level dropdowns.</p>

diff --cc marketing/download.php
Simple merge