Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	slipper/etc/conf.yaml
	slipper/messaging/amqp/consumer.py
	slipper/model/primitives.py
	slipper/storage/interface.py
	slipper/storage/sql/interface.py
	slipper/storage/sql/transaction.py
	slipper/tests/test_config.py
Merge remote-tracking branch 'origin/master'