cleaning up, and more testing with travis