Merge branch 'develop'
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/whatdotheyknow-theme
Add new message.
Update styles

Updated to match work in alaveteli feature/cleanup-popups
Remove style for special popup

Let's just try to have one popup style and mechanism.
Add link to main page.
Merge branch 'cleanup-popups'
Update the CFOI appeal wording at Tom's request
Merge branch 'develop'

Conflicts:
    assets/stylesheets/custom.scss
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/whatdotheyknow-theme
Merge branch 'master' into develop

Conflicts:
    lib/views/general/_popup_banner.html.erb