add travis config
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from nuest/master

add Travis config