Remove underscore, update grunt, etc.