vimrc cleanup
merge vimrc housekeeping