Fixing issue #122
More fixes to work on the badge template links
Merge remote-tracking branch 'origin/Working-Badge-Templates'