Tidying up some of the templates
Updating readme with instructions