Added travis config
Merge branch