travis ci finally working, cleaned up a bit