removed [None] default values from wsgi_handler, checked for strings in DB.query()
 added wsgi_helper class to replace wsgi_handler.  not used yet
renamed wsgi_helper to WSGIHandler
fixed concordance.py conflict
fixed wsgi_handler conflict
Merge branch 'clovis-master'
Merge pull request #26 from ARTFL-Project/master

merge downstream
Merge pull request #27 from clovis/master

merge from clovis
initial commit of word frequency widgets, untested
merged from ARTFL
Merge branch 'ARTFL-Project-master'
merged from upstream
Merge branch 'ARTFL-Project-master'
Merge pull request #30 from ARTFL-Project/master

merge downstream
fixed unicode collocations, hopefully
Merge pull request #302 from rwhaling/master

merge upstream.