Minor updates to travis, including the requirement for six