Merge from branch grunt. Move to grunt-ejs-static to stay DRY