Add support for OpenStack Swift-based backups, cleanup odd bits of code