Re-added travis.yml
Merge commit '577629f799a0048a2cc457c8dcee36e46387e440'