Updated some modules
Switched from Makefile to Gruntfile