Investigation into travis failures

Do not merge!!!