setup travis
merge