WIP for Issue #138 -- Don't merge

Trying to take advantage of the Travis matrix ox build environments.