Merge pull request #224 from erwincoumans/master

update badges in README.md
Merge remote-tracking branch 'bp/master'