Merge pull request #6 from ARTFL-Project/master

Merge upstream
merge more stuff
fix javascript oversight
Merge pull request #24 from clovis/master

Fix css and merge moer code
add a PostFilter for word frequencies normalization
Update PostFilters.py
various fixes to layout of search explanations
minor changes in explanations
reorganize javascript, and minor fixes
make collocation update via AJAX calls
add working indicator for collocations
Update style.css
Update cite.py
Update kwic.py
Merge pull request #25 from clovis/master

Many fixes, and make collocation use ajax calls to update results
tidy up frequency reports
Merge branch 'master' of github.com:clovis/PhiloLogic4
restore frequency per 10,000 words but as an option within the frequency report
Restore default KWIC biblio
Merge pull request #26 from clovis/master

Updates to frequency report