US, Colombia trade deal to be in place in May