Updated dotfiles

* Updated PATH variable to include Postgres.app, npm
* Added informative rvm prompt
* Added difftool to use p4merge in gitconfig