A colleague and I are currently working on Noted (http://notedwiki.com http://notedwiki.com), which matches what you are looking for, except that we are plannin

A colleague and I are currently working on Noted (http://notedwiki.com http://notedwiki.com), which matches what you are looking for, except that we are planning on charging when it launches. It is currently in development, but we are going to be looking for beta testers soon, which may provide an opportunity for a free or discount copy.