Fix travis creds
Merge branch 'master' into travis-tweaks