I hadn't looked into Tiddlywiki [tiddlywiki.com] in a few years, but it's even more flexible and useful these days now that JavaScript is so prevalent.