Merge branch 'master' of github.com:suisho/kura

Conflicts:
	dotfile/gitconfig