Improve Fiona and Shapely usage.

The shapely.geometry.asShape() and fiona.collection() methods
aren't for developers. I've replaced them with calls to
shapely.geometry.shape() and fiona.open().