config optiosn
Merge remote-tracking branch 'upstream/master'
Merge pull request #794 from patriot1burke/master

more saml config options