set persistent-undo option if version is min 7.3
Merge branch 'master' of github.com:timofurrer/.vim

Conflicts:
	.gitignore