Corrected some errors in the config file.
Refactored, removing all match methods from the atoms into a new `Matcher` object.  Moved `core.matcher` to `matcher`.