Merge pull request #290 from clovis/master

temporarily reinstate old behavior for search term arg handling
merge rwhaling branch
Merge pull request #62 from ARTFL-Project/master

update downstream