Merge pull request #381 from negativeExponent/travis_update