use new messaging framework for Django 1.4
Merge branch 'master' into montmere