Attempt number 4
Merge pull request #5 from scottsds/travis_four

Attempt number 4