Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io into feature/water-butler
Merge branch 'feature/water-butler' of https://github.com/CenterForOpenScience/osf.io into feature/water-butler
Merge branch 'feature/water-butler' of https://github.com/CenterForOpenScience/osf.io into feature/water-butler
Separate identity serialization into credentials and settings.