f
Merge branch 'master' of git://github.com/slnc/dotfiles

Conflicts:
	.vimrc
f
Merge branch 'master' of git://github.com/slnc/dotfiles

Conflicts:
	.vimrc