Make config protected, remove services key

Tidy up config class re #266
Add extra error description to OAuth2 errors

Re #249
Merge pull request #320 from ianbarber/master

Fix two issues