Depending on your text editor of choice, vimwiki (https://code.google.com/p/vimwiki/) could be what you're looking for. It stores all data in plain text files which can easily be versioned in your VCS of choice and/or stored in a Dropbox folder. I've been using it for a while now, works like a charm.