Merge pull request #1 from calvinmetcalf/first-touchups

First touchups
clean up gruntfile
update package.json
Merge branch 'master' into first-touchups