Travis config merged

now with less commits