Fix issues in the travis-ci build.
Merge pull request #725 from mhaskel/travis

Fix issues in the travis-ci build.