A few tweaks to the .vimrc
Merge branch 'macrocarpa'