Updated Gruntfile. Fixes #69
Merge branch '69-gruntfile' into milestone-1.6