updated
Merge branch 'master' of https://github.com/maechiu/vimfiles

Conflicts:
	.vimrc