Merge branch 'develop'

Gruntfile.coffee

@@ -43,13 +43,12 @@ module.exports = (grunt) ->
         require: 'coffee-script'
         compilers: ['coffee:coffee-script/register']
         files: 'test/specs/**/*.coffee'
-      all:
+      test:
         options:
           reporter: 'spec'
       coverage:
         options:
-          coveralls:
-            serviceName: 'travis-ci'
+          coveralls: true
       htmlcoverage:
         options:
           reporter: 'html-cov'
@@ -73,6 +72,6 @@ module.exports = (grunt) ->
 
   # Default task.
   grunt.registerTask "default", ["coffeelint", "coffee"]
-  grunt.registerTask "test", ["default", "mochacov:all", "mochacov:htmlcoverage"]
-  grunt.registerTask "test:travis", ["default", "mochacov:all", "mochacov:coverage"]
+  grunt.registerTask "test", ["default", "mochacov:test", "mochacov:htmlcoverage"]
+  grunt.registerTask "test:travis", ["default", "mochacov:test", "mochacov:coverage"]
 

README.md

@@ -154,5 +154,3 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
 
 ## License
 Copyright (c) 2013 We Are Interactive under the MIT license.
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/weareinteractive/node-coffee-toaster-api/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

package.json

@@ -24,12 +24,14 @@
       "url": "https://github.com/weareinteractive/coffee-toaster-api/blob/master/LICENSE-MIT"
     }
   ],
-  "main": "./lib/toaster",
+  "main": "lib/toaster",
   "engines": {
     "node": ">=0.8.0"
   },
   "scripts": {
-    "test": "grunt test:travis",
+    "test": "grunt test:travis"
+  },
+  "config": {
     "blanket": {
       "pattern": ["coffee-toaster-api/lib"]
     }