Separate out the document serializing from the saving-to-file.
Merge branch 'master' of github.com:tabatkins/bikeshed
Begin doing real testing.