Removing hardcoded badge tags
Merge pull request #819 from christensenep/1025092

Fixes bug 1025092 - Remove hardcoded badge tags