Added branches config to .travis.yml again.
Removed TravisYML from dist.ini

... and fixed up .travis.yml by hand.