Lots of little cleanup
Merge branch 'master' of github.com:thefinn93/BuildbotStatusShields