Configure travis to excluded tests with travis_exclude attribute set, for tests that require private API keys
Merge branch 'release-2.1'