add waffle.io badge
fix encoding issues introduced by waffle.io pull request
Merge pull request #7 from waffleio/master

waffle.io Badge