Major rewrite of vimrc