rewrote parsers to be more modular; untested.
Merge branch 'master' into unstable
more broken state (code from monday, #commitfail)
working on a fix...
test.py now contains a valid example (at least, using a test_acm.txt file that's about 3-4 months old...)