Merge pull request #161 from vergenzt/develop

Add Grunt watch task