Update Pylons configuration notes
Merge pull request #276 from linovia/getsentry_master

Vendor version of six.
Merge branch 'master' of github.com:getsentry/raven-python
Dont lint six
3.2.0
Async suport on threaded transport
Actually make threaded transport work
Actually make threaded transport work
Remove unused send function and correct indentation
Merge branch 'threaded-callbacks'

Conflicts:
	raven/transport/threaded.py
I give up, pep8/lint six. dealwithit.jpg