Support for {Li,Na} syntax in parse_criteria. Works for both formulas and
elements.
Fix unittest/
Fix parsing error.
More bug fixes.
More minor bug fixes.
Automatic Py3k merge for testing