Changes
Merge branch 'master' into fork

Conflicts:
	tinys3/connection.py
	tinys3/request_factory.py
Merge pull request #1 from fatal10110/fork

Fork