Merge branch 'release-0.3.0'
Merge branch 'release-0.3.1'
Merge branch 'release-0.3.2'
add waffle.io badge
Merge pull request #26 from waffleio/master

waffle.io Badge
Update waffle.io badge to be https so GitHub does not cache the image.
Merge pull request #27 from waffleio/master

Update waffle.io badge to be https so GitHub does not cache the image.
Merge branch 'release-0.4.0'

Conflicts:
	README.md
Merge remote-tracking branch 'origin' into develop