Major refactoring of vimrc