Added some new Grunt magic
Merge fix and some minor adjustments