Adds to travis config.
Merge remote-tracking branch 'origin/travis'