Updated configfile to new format

Matchsets now contained in matchset tags, for consistensy
removed logfiles from git

no reason to sync these
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/org/bb/ConfigHandler.class