Host the app with nginx + uwsgi
Nginx is now optional
Removed `sudo` in Makefile
Merge pull request #26 from lanets/docker_n

Removed `sudo` in Makefile
Merge branch 'master' into nginx

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

Host the app with nginx + uwsgi
Forward port 80 for OS X's boot2docker
Merge pull request #27 from lanets/update-makefile

Forward port 80 for OS X's boot2docker
Merge branch 'master' into registration

Conflicts:
	Dockerfile