Merged my changes fom vimrc.local into vimrc