Minor additions to vimrc from work version