Updated Grunt, moved repeating html into templates