Revert "気分転換"

This reverts commit 7cf8d2ac632570cd07b1f2da7dfcf7426a79f3c3.

Conflicts:
	.vim/bundle/neobundle.vim
	.zshrc
Revert "Revert "気分転換""

This reverts commit ddc1aa6852be46373f70dca4523cd193c30d22ed.
oh-my-zsh update
Merge branch 'master' of https://github.com/koheisg/dotfiles