Re-arange few files in Gruntfile.js and remove few typos
Merge pull request #245 from robertd/fix-gruntfile

Fix gruntfile