Changed uwsgi to python installation
modified vagrant local ports
Added nginx
Merge branch 'master' of github.com:sharestack/sharestack-orchestration

Conflicts:
	README.md