Gruntfile progress
Merge branch 'master' into adding-grunt-jc
Adding Grunt jshint and watch
Gruntfile tweak