various tweaks
Merge branch 'master' of github.com:mattsawyer77/dotfiles

Conflicts:
	.vimrc