Formatting fixes
Updates to Travis again again