LUKS fixes (format change!)

Closes #462 

Edit: Ready to MERGE?

The purpose of this pull request is to get some feedback on the new LUKS code.