Updated travis config with emulator settings
Merge remote-tracking branch 'origin/master'