yaml
Merge branch 'master' of git://github.com/locojay/locovim

Conflicts:
	vimrc