Merge pull request #108 from FWeinb/grunt

Remove tmp and node_modules from repo
Merge remote-tracking branch 'upstream/grunt' into grunt

* upstream/grunt: