Merge pull request #33 from ARTFL-Project/master

Update downstream
formatting fixes
more formatting fixes for theater
KWIC bug fix
Merge pull request #175 from clovis/master

bug fixes and optimizations
Merge pull request #13 from ARTFL-Project/master

merge downstream