removed the obsolete matcher.py; renamed matcher2.py to matcher.py