Merge pull request #276 from rwhaling/master

bug fix in xml_cleanup
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
more fixes to collocation
Merge pull request #58 from ARTFL-Project/master

update downstream
merge WSGI changes
update my branch
fixed concordance.py conflict
fixed wsgi_handler conflict
Merge branch 'clovis-master'