Shameless plug: If you want the data in dropbox encrypted, try https://github.com/lucas-clemente/git-cr :) I think I've also solved most of the concurrency problems, but haven't tested it yet.