merged in all the code from ariel's branches and moved wikibios to a subdir

Benjamin Mako Hill || Want to submit a patch?