Refactor and rewrite of the spaghetti I had in place.
Dumbometer now looks for accented characters; improved the name matching. Fixes #9
Merge branch 'dumbometer'