Merge pull request #60 from clovis/master

Push fixes upstream
Merge pull request #77 from clovis/master

Update upstream
a seemingly contentless edit on StrictParser?
Merge pull request #8 from ARTFL-Project/master

merge post-encyclopedie template edits
Merge pull request #78 from clovis/master

Update upstream
Merge pull request #80 from clovis/master

Push fixes upstream
Merge pull request #81 from clovis/master

Reenable ranked relevance, fix various issues with it
Merge pull request #82 from clovis/master

More updates to ranked relevance
Merge pull request #83 from clovis/master

Fix CSS issues in Firefox and (hopefully) IE
query and parsing fixes, stub for page load filter
Merge pull request #84 from rwhaling/master

merge parser and query fixes from rwhaling
Merge pull request #85 from clovis/master

Add error template
Merge pull request #12 from ARTFL-Project/master

Update downstream