Fix for the Flat View button; going back to the fandom view should now work correctly.
Merge pull request #1608 from someonefromthewater/issues/3164-inconsistent-navigation

Issue 3164 - Fix for Inconsistent Navigation
Update index.html.erb

Pedantry
Automatically load site skins on Test after deploy

It also includes reorganising and tidying up the deploy-defining files. Moved production-only and staging-only tasks to their respective file.
Merge pull request #1613 from CristinaRO/deploy-skins-and-tidy-up

Automatically load site skins on Test after deploy