change protocol to http
Merge branch 'master' of http://github.com/m-tetsuya/settings

Conflicts:
	vim/.vimrc