vimrc: use undofile
Merge branch 'master' of github.com:miikka/dotfiles

Conflicts:
	vimrc