merge travis changes, tests. move  to service