Merge pull request #12 from stoe/master

Grunt refactor