I think Zim is the best thing out there at the moment. Is it trivial to encrypt via the Git plugin?