Added psql
update uwsgi config to fit existing struct
Merge branch 'master' of github.com:meako689/vagrant-puppet-django
Merge branch 'master' into treelist

Conflicts:
	manifests/site.pp
changes for treelist