Updates and cosmetic changes preceding PloneConf+PythonBrasil
Merged