Adds support for using rvm
Adds usr/local/bin to the system path
Resolves conflicts in bash_profile
Merge branch 'master' of github.com:samuelcarlt0n/dotfiles

* 'master' of github.com:samuelcarlt0n/dotfiles:
  Code cleanup
  Adds postgress.app to the system PATH
  Adds a source call to virtualenvwrapper

Conflicts:
	bash_profile