add link to pyramid_mako, change some maintainers
fix merge conflicts