vimrc file updates from work and refactoring/cleanup