Merge pull request #12 from ARTFL-Project/master

merge downstream
more parser fixes
Merge pull request #175 from clovis/master

bug fixes and optimizations
Merge pull request #13 from ARTFL-Project/master

merge downstream
Merge pull request #176 from clovis/master

Remove profiler code and restore byte length defaults for concordance and kwic
Merge pull request #177 from rwhaling/master

merge upstream, parser fixes
Merge pull request #14 from ARTFL-Project/master

merge downstream
Merge pull request #179 from clovis/master

Merge bug fixes
Merge pull request #181 from clovis/master

update upstream
Merge pull request #182 from rwhaling/master

Merge pull request #14 from ARTFL-Project/master
fixes to SQL ordering bugs
Merge pull request #183 from rwhaling/master

fixes to SQL ordering bugs
Merge pull request #184 from clovis/master

More fixes and CSS edits
Merge pull request #34 from ARTFL-Project/master

Update downstream