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

waffle.io Badge
Move waffle badge
Merge branch 'master' into appraisals

Conflicts:
	README.md
remove ws