Allow for pattern stanzas in source definitions
Ability to set ordering when multiple matches share the same file
Merge branch 'match_order'