Merge accelerators in Mozilla .properties files

Fixes bug 115.
Simplify tests

After the previous commit, TestProp2PO.prop2po() can take an optional
personality kwarg, so use that.