Refactor encrypted aws creds.
travis bump
Merge branch 'master' into windows [skip ci]
Try a travis run