Add the match DB
Merge remote-tracking branch 'badger/master'
Handle the --yaml option on the cli too.

Change-Id: I3f72077dac449a7507d7dadc444086a3563c6a08