Reducing redundant redundancy
More sensible naming of badges
Merge branch 'master' into api
Handling API errors in the API
Merge pull request #182 from andrewhayward/api

API changes