Vimrc file cleanup and tweaks