bug fix in xml_cleanup
Merge pull request #277 from clovis/master

Rewrite navigation report
Merge pull request #278 from clovis/master

bug fixes
Merge pull request #24 from ARTFL-Project/master

merge downstream
increased buffer size in pack.c; was causing errors on long lines in word records
removed redundant try/except in navigation, added attempt to get n with type in toc
modified ObjectWrapper for initialization w/pre-fetched Row; using this in navigation report for safer lookup
Merge pull request #276 from rwhaling/master

bug fix in xml_cleanup
fixed bug in ObjectWrapper-based navigation.py
split out navigation sql code into a nav_query function
tiny fix in naw_query
Merge pull request #281 from rwhaling/master

Bug fixes
bug fixes
use new nav_query function
add command line parsing to xml_cleanup, and other things
convert entities to the utf-8 equivalent
move render_template to functions, fix concordance_from_collocation, and many other fixes
rewrite collocation javascript code
fix collocation/collocation_from_collocation mismatch
bug fix in collocation when hitlist not done, tweak in concordance citation