Encryption, merging scary changes, feature flags

[imsodin (Simon)]

Here it is: Early Testing for Untrusted (Encrypted) Devices