Adding some changes from my .vimrc at work