Merge branch 'master' of git://github.com/sgillies/shapely into py3

Conflicts:
	shapely/geometry/__init__.py
	shapely/geometry/base.py
	shapely/tests/__init__.py

Manually merged.