Encryption, rake tasks, data integration

My master branch got seriously corrupted today when I tried to purge `.DS_Store` from it, but I've fixed the changes and gotten back to where I was. I'm marginally annoyed at git right now...

Anyway, these are ready to merge.