Finish removing rvm. Fixes for Postgres DB. Updated submodules