Change structure of match fields.
Merge branch 'dev' of github.com:flavioc/meld into flavio-dev

Conflicts:
	vm/exec.cpp