Remove _site; minor mods for GAE