Updated travis and reqs
conflicts