shuffle locations around a bit
Fixed host for postgres.
Moved docbuild directory into a writable location ;))
Merge branch 'master' into new_server