Remove obsolete file
Adds postgress instalation step; Add RBENV_ROOT env variable
Resolve merge conflict