Fix double firing 404 GA code
Fix template-404.php
Merge branch 'master' of github.com:jonhockley-dansmart/bromley