updated vimrc file with merged settings from work vimrc
merged into a single vimrc file