Fix bugs.

重複箇所やエラーが出る箇所を修正した
Merge branch 'develop' of https://github.com/zukimochi/dotfiles into develop

Conflicts:
	.vimrc