Add badge type to badges
Small tweaks
Merge pull request #322 from mozilla/badge-types

Add badge type to badges