Use Ordinary calling format by default
Merge branch 'master' of https://github.com/CenterForOpenScience/waterbutler-s3