Add Travis support
resolve conflicts for travis