turn on vim undo
Merge branch 'master' of github.com:kinnou02/dotfile

Conflicts:
	etc/vimrc
	etc/zshrc