update uwsgi config to fit existing struct
Merge branch 'master' of github.com:meako689/vagrant-puppet-django
Merge remote-tracking branch 'origin/master' into 42deploy