Detect already escaped ampersands
Merge remote-tracking branch 'assaydepot/fix_amp_regex'
Merge branch 'master' of git://github.com/onelogin/ruby-saml