Changes to .vimrc

Imported some settings from work .vimrc file