add badges
formatting
Merge pull request #1 from bcherny/master

Rebase off bcherny/master