Conflict in gvimrc
Merge branch 'master' of github.com:sajoku/dotfiles
Merge branch 'master' of github.com:sajoku/dotfiles
Cleanup zshrc for rvm
Merge branch 'master' of github.com:sajoku/dotfiles