Grunt SVG stuff and general tidy-up