Merge pull request #132 from University-of-Auckland/aaf-develop

Config: SimpleSAMLphp support (and SLO URL fixes)