Merge pull request #1 from reid/master

Travis config