More work on moving to grunt and npm.