Fixes for Travis CI builds
Merge pull request #166 from eric/travis-ci-fixes

Fixes for Travis CI builds