modified:   vimrc
merged settings from brainslug-branch