Django 1.5 fixes, also turn indexing back on (oops)