reverts broken merge
More pep8ify
Adds SoftLayer Message Queue functionality
contextmanagers that needs finally
Remove sqs_message and sqs_queue objects when restoring SQS message.  Closes #1108
virtual QoS: Flush must happen before append, not after
virtual QoS support for basic_get
Ignore exceptions in Consumer.__exit__
Fixes compression header removal for the serializable case
Adds Alex Koshelev to AUTHORS
Merge branch '2.5'

Conflicts:
	pavement.py
Merge branch 'sudorandom/SLMQ'
Adds Kevin McDonald to AUTHORS
flakes
Virtual: Properly escape regex.  Closes #194
Virtual: Properly escape regex.  Closes #194
Bumps version to 2.5.5
Adds "#" + "*" to regex escape whitelist
Updates Changelog
Merge branch '2.5'

Conflicts:
	kombu/transport/virtual/exchange.py