Fixed Gruntfile
Rollback HandlerM (still needs rewriting)