Added Grunt and some other speed optimizations