Major .vimrc refactoring