Host the app with nginx + uwsgi
Nginx is now optional
Merge branch 'master' into nginx

Conflicts:
	Makefile
Merge pull request #22 from lanets/nginx

Host the app with nginx + uwsgi