merging in some local .vimrc changes