use new 'test excludes' functionality for travis
Merge branch 'master' into travis_test
Merge pull request #1021 from dimagi/travis_test

use new 'test excludes' functionality for travis