Merge pull request #4 from benregn/develop

Vagrant single machine, serve static with nginx and runserver script
Merge pull request #5 from benregn/develop

Misc fixes and upstream merge
update requirements versions
add support for vagrant-cachier plugin
not install uwsgi globally
add django debug toolbar urls when in DEBUG
Revert "split settings into separate files"

This reverts commit ccd6f6f16939a83a30da3cf22d20ed5469844ce1.
Revert "adjust configured paths after settings split up"

This reverts commit b0bfe704394b4ebe7fc31623c1670252937bae0b.
Merge branch 'master' into develop