Drkitty save revamp mark ii

This merges master into the pull request, and updates Maintain migrations to handle delegated stuff better.