fix missing double quote
fix missing trailing slash
change merge function to deep_merge in order to merge user input into the nested hash rather than replace the entire key
add logic to identify the appropriate authentication flag to set 'sufficient' for all but the final authentication method
change all instances of '.*' to '*' as to allow admin.aclpolicy to work properly.  with '.*' access to all projects is denied
change the logic to assign authentication flags differently as ldap comes before active_directory in the jaas-auth.conf.erb template
fix the elsif so it checks for the correct value
fix variable name
Revert "fix variable name"

This reverts commit b30495cf14bf53f20c470ccb1b67102b16ec1ebb.
add the period back for one entry
Fix a change I reverted because sometimes I mess up with git
Merge pull request #29 from smithtrevor/ad_auth

Ad auth
Merge branch 'master' into qa