Merge branch 'master' of https://github.com/miyahira/dotfiles

Conflicts:
	home/.vimrc
	home/.zshrc
Merge branch 'master' of https://github.com/miyahira/dotfiles