This is the point I chime in about my favorite personal wiki:
TiddlyWiki -
It's a self contained html document that's a javascript driven wiki. I've been using it for my material and it allows for really easy transition to the web... since you just host the html file.
Examples and shameless plugging:
It tends to work for me as I don't tend to linearize my processes.