change for windows
bugfix
Merge branch 'master' of http://github.com/ysfukumo/dotfiles

Conflicts:
	_vimrc