edit .vimrc
Merge branch 'master' of github.com:ymizushi/dotfiles

Conflicts:
	.vimrc