Added badge tags
fixing template tags
Merge pull request #396 from mozilla/badge-tags

Added badge tags