unmerged grunt stuff
Merge pull request #8 from wikitongues/other-grunt-stuff

unmerged grunt stuff