commit
Merge branch 'master' of https://github.com/hayago/dotfiles

Conflicts:
	.vimrc.editor
	.vimrc.module
	.vimrc.vundle