Minor style tweaks and simplify travis.yml.