Added REPORTING_ENV variable to .bashrc.
.bashrc detects chruby or rvm and sets up ruby appropriately.
.emacs disables hl-line-mode and blink-cursor-mode.
.psqlrc sets border to 2 and disables pager.
resolved .emacs merge conflict