Merge in docs branch
Add changes to run postgres