Joined doc and unit tests in single call

`make test` now uses a single call to nosetests to run doctests and unit
tests. So the failures and errors are grouped at the end.
Merge branch 'master' into inversion