Merge pull request #12 from ARTFL-Project/master

Update downstream
javascript fixes in KWIC/concordance functions
fixes to KWIC, and configure from db_locals which reports to enable
add time series back to the search form: we can now hide the button from db_locals
disable unused functions, add progress bar to collocation report
cleanup including removing format.py
fixes in page image viewer
change url after ajax calls using History.js
scroll to highlighted term
Merge pull request #88 from clovis/master

Merge upstream