Adding Grunt tasks & HTML tidy up