Update README.md

Added Waffle.io badge
Merge branch 'master' into cassandra