don't let vim change terminal title
Merge branch 'master' of github.com:watsoncj/dotfiles

Conflicts:
	home/.vimrc