Add magic models module.
Remove s4u.upgrade support.
Use latest zc.buildout.
Prepare 3.1 release.