Merge pull request #848 from jmaas/master

PEP8 - cobbler/template_api.py