LUKS fixes (format change!)

DO NOT MERGE. The purpose of this pull request is to get some feedback on the new LUKS code.