Merge branch 'hotfix/1.5.4'
Bumped version to 1.5.4
Added Waffle.io badge
Merge branch 'hotfix/waffle.io-integration' into develop

Conflicts:
	dynamic_dynamodb/dynamic-dynamodb.conf
	setup.py