Added Waffle.io badge.
Merge branch 'master' into scala-2.10.x

Conflicts:
	README.md