port to django>1.4
fix imports