Reorganize vimrc (again)