Add travis-ci support
Fix broken travis-ci build