[jamietanna]

Re 2 you can implement a custom Git diff tool, and so (with the encryption key) see what's changed, straight from `git diff`