Updating the travis config with secret values for config values
Merge remote-tracking branch 'origin/master'