Fix travis and line lengths

vals = vals or {} will be more pythonic