コミット

    -更新分の取得に備えて
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	.zshrc
	vimfiles/after/ftplugin/python.vim
	vimfiles/conf.d/bundle/bundle-util.vim
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	vimfiles/.netrwhist
	vimfiles/after/ftplugin/python.vim