+ New exception type - matches what was previously raised by pyparsing.
+ Update unittests based on changed code.
+ Replace pyparsing with regex based implementation.
+ Fix import errors.
+ Fix undefined variable errors.
+ Increment version number.
+ Fix broken unit test.
+ Fixes to catch some edge cases that had been missed.
+ Tidy up of regex group names.
Merge remote-tracking branch 'mark/remove_pyparsing_use_from_version_module' into 2.0
a few misc, very minor changes