Avoiding conflict nonsense
Merge pull request #62 from DigitalCurationCentre/Shibboleth-bugs

Avoiding conflict nonsense