Fix no newline at end of file for update.sh
[update.sh] Add RVM update
[.bash_profile] Move RVM stuff
[.bash_profile] RVM/switching to rbenv notes
[.gitconfig] Update mergetool path