Delete supervisord-prod.conf~
Delete nginx-prod.conf~
Merge branch 'staging'
Deployment updates
Requirements tweak
Fabfile works for Vagrant again
Working on prod deployment
Merge branch 'staging'