Merged changes into Ubuntu vimrc

Merged changes made in Windows' vimrc with Ubuntu's vimrc file