Minor set_trace improvement
Change travis.yml to deal with new branch