Tweak formatting (minor)
More tweaks to travis yaml