Merge pull request #10 from johnb30/travis

Travis-ci
Travis modifications