Fixes for 0.6.1
Update Gruntfile, merge two cases as suggested by @joneshf.
Merge pull request #17 from purescript/0.6.1

Fixes for 0.6.1