big funday refactoring
fix travis script