Merge pull request #1 from furzeface/dev

Tidying up Gruntfile.
Updated Gruntfile.