Update from develop

This brings in bugfixes and unit test improvements that have been going on in the develop branch.

It also updates tox.ini so that `tox` will run unit tests against py26, py27, and py33.