Tidy up the grunt file; prepare for karma runner