reorganized (somewhat) .vimrc file