Merge pull request #4 from oompt/gh-pages

Merging Grunt overhaul
Merge pull request #5 from oompt/master

Merge pull request #4 from oompt/gh-pages