Move badge descriptions to sidebar
Fix bug in if statement
Remove text decoration on links
Merge pull request #266 from danfowler/badges-to-roles

Badges to roles
Merge remote-tracking branch 'upstream/master' into travis-ci