Merge pull request #142 from Adron/master

Badges
Merge pull request #145 from Adron/master

Ok... a few minor badge fixes and such.
Updated the README.md to reflect the changes in API.