import unittest2 only on `setup.py test` to avoid dependency
Merge pull request #86 from Toblerity/unittest2-deps-fix

import unittest2 only on `setup.py test` to avoid dependency
Don't rule out ndarrays by testing for truth.

Because "The truth value of an array with more than one element is ambiguous.
Use a.any() or a.all()". Closes #84.
Merge commit '0decf64' up from maint-1.2.

See #84.
Merge branch 'mwtoews-v13'

Closes #83, #88
Fix documentation of parallel_offset method.

Closes #91.
Merge commit '58197ef'

See #91.
Update buffer figure to show style options.

Bump version number and note release dates in change log.

Closes #96.
Merge branch 'maint-1.2'

Conflicts:
	CHANGES.txt
	shapely/__init__.py
Updates to readme, credit, manual, setup for 1.3

Closes #99.
Last tweaks to docs, update of change log.
Dis-include credits from reademe.
Update README.rst

Trivial typo fix for README
Merge pull request #101 from bradh/patch-1

Update README.rst