Making the main loop agnostic of the matcher type.
Shuffled around a bit in the code (byebye robot.py) and some xmpp code also accidentally slipped in.