All tests pass

Leaving as two commits because I'm curious whether Travis will build both or just the tip of the branch.