Merge pull request #849 from jmaas/master

PEP8 - cobbler/templar.py
Merge pull request #850 from jmaas/master

PEP8 - cobbler/serializer.py