Add travis files
Incorporate changes from the master branch