Merge branch 'develop' into staging
configure prod env for fab
Merge branch 'develop' of github.com:caktus/pycon into develop
Adding changes to footer, ref #106.
Merge branch 'develop' of github.com:caktus/pycon into develop
Merge branch 'develop' into staging
Merge branch 'staging' into production