Merge pull request #18 from ellerh/travis-script