And you can specify your own major mode(perfect for org-mode) ... my head just exploded, and my weekend schedule is now centered around rewriting my init.el. :-)
http://jblevins.org/projects/deft/ This is different than org-velocity, as it uses multiple text files rather than an org-file or a bucket file, you can also add or delete files from within deft-mode.