Modify .vimrc
Use persistent undo and undo tree
Merge branch 'master' of https://github.com/nojima/dotfiles

Conflicts:
	.vimrc