Updates for RVM and removing vi=emacs alias
Merge branch 'master' of https://github.com/jamiereid/dotfiles