Add travis.yml from mojo to hopefully get travis tests passing
Merge remote-tracking branch 'origin/master'