Cleaner JOIN param formatting
Use dict comprehension to simply formatting

We won't support Python 2.6 anyway (since it'll be dropped by Django 1.7)
Riase minimum Django version to 1.4.2 for six