Disable long test on Travis
Merge pull request #181 from jacebrowning/feature/long-test-on-travis

Disable long test on Travis
Merge branch 'develop' into feature/doorstop-logo