Compatibility with new badge model

This updates badgekit to communicate with the new, more complete badge model in badgekit-issue.  This should not be merged until badgekit-issue is updated accordingly via a soon-to-come PR.