Itty-bitty fixes...maybe fixing Travis?

Hopefully this gets Travis on track to not bomb the execution of the
test suite, but we’ll see. Currently passing locally.