Shorten lines > 79 chars and updated travis config

The build on 7.0 is currently failing because it has some lines > 79 chars.