Merge pull request #15 from cspace-deployment/master

Bringing rev1 into sync with master
PAHMA-1093: two types of term matching now available
Merge pull request #16 from cspace-deployment/rev1

Bringing master into sync with rev1