Merge pull request #7 from malavolti/master

Added template for IdP's Metadata
Added metadata information in IdP metadata
Merge remote-tracking branch 'origin/master'

Conflicts:
	garr/shib2idp/templates/idp-metadata.xml.erb