Update gruntfile.js
Fixed issue #320 #314 - @Drew - this is the beginning of the cleanup...
Merge pull request #307 from leejessy/patch-1

Update gruntfile.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json