vimrc rabl
zsh / vim updates
fixed vimrc merge conflict