Updated badges
Merge pull request #4504 from GrahamCampbell/4.1-badges

[4.1] Updated Badges
Minor cs fixes