More vimrc cleanup
More vimrc reorganize and cleanup