Fixes for Grunt
Merge branch 'master' of github.com:somecallmechief/oj