init.
Merge branch 'master' of https://github.com/hototoh/settings

Conflicts:
	.vimrc
	.zshrc
hoge