Fixing tests on Travis.
Merge pull request #2 from wbyoung/travis

Fixed tests on Travis.