staging config in fabfile should not specify root (use ldap login instead)
Merge branch 'develop' into staging
Add new settings file for staging (because the production one has references to rca1, which breaks stuff)