Rearrange testing

This is a pretty dramatic overhaul of testing that takes out some of the dry material that I consider a little too advanced, and hopefully pursuing a gentler approach.

Next steps:
* move nosetests earlier
* integrate git