rvm stuff
Merge branch 'osx' of github.com:emileswarts/dotfiles into osx
Update zshrc file
Merge branch 'osx'