Tests now passing again.

This is a commit that will at least get us back on track with new
features.

If you want to contribute, please look at the tests and uncomment ones
that aren't being run.  Fix the bugs, we'll tag a release once we have
100% parity with 0.1.4.