Added devise_ldap_authenticatable and figaro, set up LDAP authentication via environment variables in config/application.yml
Resolved merge conflicts with Gemfiles and .gitignore