JS cleanup
Grunfile fixes and improvements