Updates nginx uwsgi config
Merge branch 'master' into graphite2

Conflicts:
	conf/supervisor/supervisord.conf
Update nginx conf