Multiple credentials 

As requested in https://github.com/LearningLocker/learninglocker/pull/194

Note, https://github.com/LearningLocker/learninglocker/pull/194 will automatically merge, but this has a conflict.