another shot at travis
Merge remote-tracking branch 'origin/travis' into travis