Tweaks to travis CI config to get a running X environment again.