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
add a new metadata_facet_per_doc variable to append title to select metadata in facets
define metadata_facet_per_doc at load time
enhance functionality of facets by allowing multiple metadata per field
rework web resources concatenation to be more robust
Merge pull request #259 from clovis/master

Work on frequency sidebar and web resources
Remove functions from concordance and kwic templates and simplify API
Merge pull request #260 from clovis/master

Remove functions from concordance and kwic templates and simplify API
more work removing functions from templates
fix get_table_of_contents script, and generate new object for API
Merge pull request #261 from clovis/master

More work removing functions from templates, API changes
remove all dependency on eval(), use strings and tuples instead
Merge pull request #262 from clovis/master

remove all dependency on eval() in frequency report, use strings and tuples instead
move concordance/kwic switcher to the scripts directory
Merge pull request #263 from clovis/master

move concordance/kwic switcher to the scripts directory
more work on TOC object
Merge pull request #265 from clovis/master

more work on TOC object