Added dj-database-url to production requirements
Added folder setup
Merge branch 'master' of github.com:notanumber/django-vagrant