add waffle.io badge
Merge pull request #83 from waffle-iron/master

waffle.io Badge
Update README.md
Update README.md

Fix travis badge.
Merge branch 'master' into dev

Conflicts:
	README.md