Added badge tags
Fixing tags when archiving
Fixing test
Merge pull request #80 from mozilla/badge-tags

Badge tags