Travis integration
Merge pull request #1 from scottsds/travis-ci_int

Travis integration