Added Travis and small cleanups