Rearrange .travis.yml, and re-enable OpenJDK 6