Merge branch 'master' of github.com:HubSpot/sortable

Conflicts:
	docs/intro.md
	js/sortable.min.js

Author: zackbloom

README.md

@@ -1,9 +1,9 @@
-## Sort Table
+## Sortable
 
-### [Demo](http://github.hubspot.com/sortable/docs/welcome)
+### [Demo](http://github.hubspot.com/sortable/docs/welcome)    [Documentation](http://github.hubspot.com/sortable)
 
-Documentation coming soon.
+Sortable is an open-source javascript and CSS library which adds sorting functionality to tables. It is tiny (`<2kb`) and has no dependencies.
 
 #### Credits
 
-Loosely based on [Stuart Langridge](https://github.com/stuartlangridge)'s [SortTable](http://www.kryogenix.org/code/browser/sorttable/) ([History](https://github.com/HubSpot/sortable/commits/e068642453bb39eed676ed338e9bbeb372ca74c4/sorttable.js), [Original](https://github.com/HubSpot/sortable/blob/37894eb51bda9f0e438d735967f16eef0d403ef9/sorttable.js))
+Loosely based on [Stuart Langridge](https://github.com/stuartlangridge)'s [SortTable](http://www.kryogenix.org/code/browser/sorttable/) ([History](https://github.com/HubSpot/sortable/commits/e068642453bb39eed676ed338e9bbeb372ca74c4/sorttable.js), [Original](https://github.com/HubSpot/sortable/blob/37894eb51bda9f0e438d735967f16eef0d403ef9/sorttable.js))

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "sortable",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "homepage": "http://adamschwartz.co/sortable",
   "authors": [
     "Adam Schwartz <adam.flynn.schwartz@gmail.com>"

component.json

@@ -2,7 +2,7 @@
   "name": "sortable",
   "repo": "adamschwartz/sortable",
   "description": "The simplest, most elegant way to sort a table.",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "homepage": "http://adamschwartz.co/sortable",
   "license": "MIT",
   "keywords": [

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

@@ -216,7 +216,7 @@
     <table class="showcase hero"><tr><td>
         <div class="showcase-inner">
             <h1>Sortable</h1>
-            <h2>The simplest, most elegant way to sort a table.</h2>
+            <h2>Drop-in script to make your tables sortable.</h2>
             <p>
                 <a class="button" href="http://github.com/hubspot/sortable">★ On Github</a> &nbsp;&nbsp;
                 <a class="button dark" href="https://github.com/HubSpot/sortable/releases">Download</a>
@@ -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>
+</html>

js/sortable.min.js

@@ -1,6 +1,6 @@
 {
   "name": "sortable",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "The simplest, most elegant way to sort a table.",
   "author": "Adam Schwartz <adam.flynn.schwartz@gmail.com>",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "coffee-script": "~1.6.3",
     "grunt-contrib-uglify": "~0.2.4",
     "grunt-cli": "~0.1.9",
-    "grunt": "~0.4.1",
+    "grunt": "~0.5.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-contrib-compass": "~0.5.0"
   }