Fix gruntfile problems that upstream merge created