Incorporate changes from ben, update grunt-run-task