Remove custom code
Merge pull request #39 from ARTFL-Project/master

Update downstream
tweaks to search form
Merge pull request #204 from clovis/master

Small tweaks