jobmanager matching wip
Merge pull request #25 from joeelsey/dev

Dev
jobmanager matching wip
no concierge fallback
no concierge fallback
Merge branch 'dev' of https://github.com/ecjs/Concierge into dev
Merge remote-tracking branch 'upstream/dev' into dev