init nginx via puppet
Merge branch 'master' into nginx
nginx and uwsgi config