Missing comma on template -> category refactoring

And several pep8 changes
Merge pull request #419 from edx/dhm/template_acceptance

Missing comma on template -> category refactoring