Merge pull request #123 from rwhaling/master

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

Update downstream
massive fixes all around
Merge pull request #124 from clovis/master

Push fixes upstream
Merge pull request #125 from rwhaling/master

added tei-cleanup and tagcensus
more CSS cleanup
Merge pull request #126 from clovis/master

more CSS cleanup
fix time series
Merge pull request #127 from rwhaling/master

added html entity conversion scripts
various CSS adjustments
More CSS changes
fix bug in clear form
new attempt at fixing bug in clear form
replace Google Charts with a custom one
various fixes to time series and other CSS problems
prep work for the new words table
small CSS adjustments
add PhiloLogic logo to footer
Merge pull request #128 from clovis/master

Many fixes, new time series code, new words table
CSS adjustments