Migrate to ldap
Don't store ldap config
Pinning devise_ldap_authenticatable to a specific commit

Pending a new release of devise_ldap_authenticatable, adding commit ref so unanticipated changes don't creep in unannounced.  Should be changed to point at official rubygems release once it comes out.
Update devise_ldap_authenticatable to a released version
Merge branch 'master' into ldap
Migrate to ldap
Don't store ldap config
Pinning devise_ldap_authenticatable to a specific commit

Pending a new release of devise_ldap_authenticatable, adding commit ref so unanticipated changes don't creep in unannounced.  Should be changed to point at official rubygems release once it comes out.
Merge remote branch 'origin/ldap' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
added some excludes to the ignore file
changed url for preview (not sure if this is actually used)
ignore app config
Migrate to ldap
Don't store ldap config
Pinning devise_ldap_authenticatable to a specific commit

Pending a new release of devise_ldap_authenticatable, adding commit ref so unanticipated changes don't creep in unannounced.  Should be changed to point at official rubygems release once it comes out.
Update devise_ldap_authenticatable to a released version
Migrate to ldap
Don't store ldap config
added some excludes to the ignore file
changed url for preview (not sure if this is actually used)