Give license definitions some structure
Unify format of Matcher constructors
Merge pull request #81 from mainej/structure-license-definitions

Structure license definitions