Fix messed up .gitmodules config
change feodra -> fcrepo
Unzip and symlink matterhorn in place
use solr module
Merge from upstream