Fix org/program relationship
Merge branch 'v2.0' of https://github.com/mozilla/openbadger into v2.0