disbale some ConflictMotions mappings
dict
Merge branch 'master' of github.com:lilydjwg/dotvim

Conflicts:
	vimrc
vimrc: folding error