Adding travis-ci yaml
Merge remote-tracking branch 'origin/master'