Add Travis-CI
merge from lyndsy travis fix