add contacts, fix logo metadata generation, some encoding fiddling, fix metadata so aggregation simpleSAMLphp plugin works