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