Change grunt

Simplifying grunt and trying to fix Github's compilation of it all