removed extra gundo mapping
resolved conflict
Merge branch 'master' of github.com:dacresni/myconfigs

Conflicts:
	.vimrc