.
Merge branch 'master' of github.com:xbot/dotfiles

Conflicts:
	vimrc
...