more
Merge branch 'master' of github.com:terryma/dotfiles

Conflicts:
	.vimrc