Move from travis ci to circle ci
Merge in ci config changes