Merge branch 'grunt' into v2.0.0alpha

Conflicts:
	grunt.js
	package.json
	public/dist/humanize.min.js

.travis.yml

@@ -3,6 +3,5 @@ node_js:
     - "0.11"
     - "0.10"
     - "0.8"
-    - "0.6"
 notifications:
     email: false

Gruntfile.js

@@ -0,0 +1,47 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        coffee: {
+            glob_to_multiple: {
+                options: {
+                    bare: false
+                },
+                cwd: 'coffee/',
+                expand: true,
+                flatten: false,
+                src: '**/*.coffee',
+                dest: 'public/',
+                ext: '.js'
+            }
+        },
+
+        watch: {
+            coffee: {
+                files: "<%= coffee.glob_to_multiple.src %>",
+                tasks: ["coffee", "uglify"]
+            }
+        },
+
+        uglify: {
+            dist: {
+                src: 'public/src/*.js',
+                dest: 'public/dist/humanize.min.js'
+            }
+        },
+
+        jasmine: {
+            options: {
+                specs: ['public/test/*.js']
+            },
+            src: '<%= uglify.dist.dest %>'
+        }
+    });
+
+    grunt.loadNpmTasks("grunt-contrib-watch");
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-coffee');
+    grunt.loadNpmTasks('grunt-contrib-jasmine');
+
+    grunt.registerTask('default', ['coffee', 'uglify']);
+    grunt.registerTask('build', ['coffee', 'uglify', 'jasmine']);
+    grunt.registerTask('test', ['coffee', 'uglify', 'jasmine']);
+};

coffee/test/test_humanize.spec.coffee

@@ -19,7 +19,6 @@ describe 'compactInteger tests', ->
         expect(Humanize.compactInteger(100)).toEqual('100')
         expect(Humanize.compactInteger(123456789, 1)).toEqual('123.5M')
 
-
 describe 'Ordinal value of numbers Test Suite', ->
 
     describe 'Ordinal value for numbers ending in zero', ->

package.json

@@ -42,9 +42,12 @@
     "dependencies": {
     },
     "readmeFilename": "README.md",
-    "devDependencies": {
-        "grunt": "~0.3.15",
-        "grunt-coffee": "0.0.x",
-        "grunt-jasmine-runner": "0.6.x"
-    }
+  "devDependencies": {
+    "grunt-cli": "~0.1.9",
+    "grunt": "~0.4.1",
+    "grunt-contrib-jasmine": "~0.4.2",
+    "grunt-contrib-coffee": "~0.7.0",
+    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-watch": "~0.4.4"
+  }
 }