fix merge conflicts. Yeesh
Merge branch 'master' into jf/swift_auth_version
default to auth v2