Updates nginx uwsgi config
Merge branch 'master' into graphite3
Updates nginx conf