Misc. changes to vimrc