Updates/fixes to prepare for Freyja release:
  * Removed backup/restore volume from UI while it's still under development.
  * Revised text on Request More Resources form.
  * Updates requirements.
  * Steve did something to ldap.py
Fixed merge conflicts.