Dev/kwiver integration

Bleh, looks a little more complicated than that; some tests start failing with the "obvious" changes to the grammar parsing.