TEMP COMMIT - Shibboleth review follow-up

 * Using files for binary data files
 * Cleaned up some of the templates