Tidies up grunt tasks
Merge pull request #1147 from jmeas/fix-grunt-test

Tidies up grunt tasks