Tidy up, fix regressions
Merge branch 'styleguide' of https://github.com/guardian/mobile-apps-article-templates into styleguide