Travis modifications
Merge pull request #11 from johnb30/travis

Travis modifications