tweak dotfiles
Merge ssh://github.com/alexbartlow/dotfiles

Conflicts:
	dotfiles/.vimrc