Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'staging' into production
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'staging' of github.com:caktus/pycon into staging
Merge branch 'develop' into staging
Fixing sponsorship button on homepage.
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'staging' of github.com:caktus/pycon into staging
Merge branch 'staging' into production
Merge branch 'develop' into staging
Merge branch 'staging' into production
Merge branch 'develop' into staging
Merge branch 'feature/finaid-application-cleanup' into staging

Going ahead and using these changes provisionally on staging (but
won't merge to develop until reviewed).
Merge branch 'feature/finaid-application-cleanup' into staging

Add hotel dates fix
Merge branch 'develop' into staging