pep8, django1.5 and smal fix