Added stuff from mscoutermarsh .vimrc