Merge branch 'master' of https://github.com/Toblerity/Shapely into v13

Conflicts with manual merges:
	CHANGES.txt
	setup.py
	shapely/geometry/__init__.py
	shapely/geometry/base.py
	shapely/tests/__init__.py

Furthermore, apply more PEP8 styling to shapely/geometry/base.py, and
convert old-style getter/setter properties to decorator-style available
since Python 2.6. For BaseGeometry, these property changes are:
 - _get_geom/_set_geom -> _geom
 - geom_type is a regular property that returns self.geometryType()