various fixes and tweaks taken from robs snagging list, link updates and template completions
Merge branch 'master' of https://github.com/ONSdigital/tredegar