Merge branch 'master' into cleanup

Conflicts:
	README.md
	docs/intro.md

Author: adamschwartz

README.md

@@ -1,7 +1,8 @@
-## Sort Table
+## Sortable
 
-### [Demo](http://github.hubspot.com/sortable/docs/welcome)
-### [Documentation](http://github.hubspot.com/sortable/)
+### [Demo](http://github.hubspot.com/sortable/docs/welcome)    [Documentation](http://github.hubspot.com/sortable)
+
+Sortable is an open-source javascript and CSS library which adds sorting functionality to tables. It is tiny (`<2kb`) and has no dependencies.
 
 #### Credits
 

docs/intro.md

@@ -51,12 +51,12 @@ This example uses the "bootstrap" theme. For a full list of supported themes, ch
 
 To learn more about how to use sortable, visit our API pages.
 
-- [Basic](http://github.hubspot.com/sortable/api/basic)
+- [Options](http://github.hubspot.com/sortable/api/options)
 - [Themes](http://github.hubspot.com/sortable/api/themes)
 
 #### Credits
 
-Sortable is free and open-source, released on the [MIT Licenese](https://github.com/HubSpot/sortable/blob/master/LICENSE).
+Sortable is free and open-source, released on the [MIT License](https://github.com/HubSpot/sortable/blob/master/LICENSE).
 
 #### Credits
 

docs/welcome/index.html

@@ -428,5 +428,26 @@ <h2>Help us spread the word.</h2>
             }
         })();
     </script>
+
+    <!-- HubSpot analytics -->
+    <script type="text/javascript">
+        (function(d,s,i,r) {
+            if (d.getElementById(i)){return;}
+            var n=d.createElement(s),e=d.getElementsByTagName(s)[0];
+            n.id=i;n.src='//js.hubspot.com/analytics/'+(Math.ceil(new Date()/r)*r)+'/51294.js';
+            e.parentNode.insertBefore(n, e);
+        })(document,"script","hs-analytics",300000);
+    </script>
+
+    <!-- Google analytics -->
+    <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+        ga('create', 'UA-45159009-1', 'hubspot.com');
+        ga('send', 'pageview');
+    </script>
 </body>
 </html>