Python 2/3, Django 1.5+, general cleanup