Switch back to rvm
Add postgres incantation
Fix updated git-prompt