hmm
Merge branch 'master' of github:baabelfish/dotfiles
Merge branch 'master' of github:baabelfish/dotfiles
Merge branch 'master' of github:baabelfish/dotfiles

Conflicts:
	.vimrc