Merge pull request #20 from ARTFL-Project/master

merge downstream
Merge pull request #21 from ARTFL-Project/master

merge downstream
early fixes for words-table in loader,postfilters
Merge branch 'master' of github.com:rwhaling/PhiloLogic4
Merge pull request #256 from clovis/master

Bug fixes
Merge pull request #259 from clovis/master

Work on frequency sidebar and web resources
Merge pull request #260 from clovis/master

Remove functions from concordance and kwic templates and simplify API
Merge pull request #261 from clovis/master

More work removing functions from templates, API changes
Merge pull request #262 from clovis/master

remove all dependency on eval() in frequency report, use strings and tuples instead
Merge pull request #263 from clovis/master

move concordance/kwic switcher to the scripts directory
Merge pull request #265 from clovis/master

more work on TOC object
Merge pull request #22 from ARTFL-Project/master

merge downstream
added PageWrapper for safe page object lookup
Merge pull request #266 from rwhaling/master

add pageWrapper and word table fixes
added PageWrapper and WordWrapper for safe page/word object lookup
Merge pull request #267 from rwhaling/master

added PageWrapper and WordWrapper for safe page/word object lookup
Merge pull request #268 from clovis/master

More work on concordance and KWIC objects
Merge pull request #269 from clovis/master

Work on bibligraphy object, remove cite.py
Merge pull request #270 from clovis/master

bug fixes
bug fixes