NeoBundle 'editorconfig/editorconfig-vim'
Merge branch 'master' of https://github.com/omoon/dotfiles

Conflicts:
	.vimrc