ENH persistent undo, fix whitespace after ipdb iab
Merge branch 'master' of github.com:amueller/vim-config

Conflicts:
	.vimrc