Add travis-ci config
Merge remote-tracking branch 'origin/master'
Add travis-ci config