tests pass (though they don't do much)
Merge branch 'master' of github.com:nhoffman/bioy
Merge branch 'master' of github.com:nhoffman/bioy