Clean up and added travis-ci