Shinji cleanup

After much tinkering and ugly fixes, shinji is back online at last. There isn’t much left on it except a new subversion server and a couple test vhosts.