Started to reorganize the code based on django-1.5 best practices; Also started cleaning up some PEP8 items