Merge pull request #57 from mLuby/dev

Decimated Gruntfile.js
Decimated package.json