vimrc cleanup and reorganization and fixes