Merge in changes from HM_Backup 2.2

See https://github.com/humanmade/hm-backup/commits/master for details of the individual changes.