Pretty much pseudo-commit to make Hg let me merge some stuff in, only change was the "system plugin" key in $plugin_meta in PluginManager

<?php
class Text_Wiki_Render_Plain_Include extends Text_Wiki_Render {    
    function token()
    {
        return '';
    }
}
?>