Added attribute-map file to puppet script.
Updated shibboleth settings, jwachter user role.