Grunt updates

This PR fixes some grunt workflow bugs and generally neatens things up without changing the API.