Tell Travis to use test settings for faster tests.
Merge branch 'master' of github.com:timster/gallery