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

Conflicts:
	home/.vim/bundle/.neobundle/install_info
	home/.vim/bundle/neobundle.vim
	home/.zshrc
modify