Merge pull request #732 from chrisglass/fix-travis