Added grunt-bower-requirejs
We copy over the .jshintrc file now
Merge remote-tracking branch 'origin/master'