fix conf
Merge branch 'develop' of github.com:HirokazuMiyaji/profiles into develop

Conflicts:
	.vimrc