Merge branch 'release/0.2.5' into develop
Add tox for running tests (via make test).

Use a Makefile to set up virtualenv and run tox.  Fix docs to cleanly
build without error.
Add travis-ci support.
Merge branch 'develop'