After some thought about which personal note-taking and wiki system I'm going to try to use Zim, a python-built desktop wiki system.
The documentation and install files are given here: http://zim-wiki.org/manual/About.html.
The point of Zim is to print a personal file/wiki system to your computer. I am going to use Zim on my desktop but stored in Dropbox or AeroFS to use as my online backup. We'll see how it goes.
