cleanup
upgraded grunt, beautified code, fixed small jshit bugs