I did a quick search but didn't find what I was looking for. So feel free to flame me if it's been posted before. Just ease the burn a little with a link or better query for searching.

One of the things mentioned on Hacking Dojo (in one of the classes), was using a personal / desktop wiki to keep track of your notes when doing pen tests. Thinking about it, I think that's a better idea for any long term tracking (been doing it via text files but find them lacking). I asked on the Hacking Dojo student forum, but figured I'd ask here too.
Does anyone have recommendations for personal documentation / project documentation / pen-test documentation?
I've used Leo, and Twiki in the past. Some have mentioned TiddlyWiki, but I want something more than a flat file (Why I'm not firing Twiki back up). I've also been looking at Zim, but not sure about it yet.