Update watch tasks to allow watch to run tests

Gruntfile.coffee

@@ -137,13 +137,14 @@ module.exports = (grunt)->
             sass:
                 files: ['./src/**/*.scss']
                 tasks: ['sass', 'copy:styles']
+            test:
+                files: ['./src/**/*.coffee', './src/**/*.js', './test/**/*.coffee']
+                tasks: ['test']
 
     grunt.registerTask 'default', 'build'
 
     grunt.registerTask 'build', ['rsync', 'sass:build', 'jade', 'copy', 'browserify:dev', 'exorcise']
 
-    grunt.registerTask 'clean-watch', ['clean', 'build', 'watch']
-
     grunt.registerTask 'dist', ['rsync', 'sass:dist', 'jade', 'copy', 'browserify:prod', 'uglify']
 
     grunt.registerTask 'prepublish', ['clean', 'coffee']
@@ -155,6 +156,10 @@ module.exports = (grunt)->
 
     grunt.registerTask 'test', ['mochaTest']
 
+    grunt.registerTask 'watch-dev', ['clean', 'build', 'watch:static', 'watch:coffee', 'watch:jade', 'watch:sass']
+
+    grunt.registerTask 'watch-test', ['clean', 'build', 'watch:test']
+
     args = process.argv[..]
     while args.length > 0
         switch args[0]