PEP8 error E302 in services.py
PEP8 error E302 in templar.py
Merge pull request #1269 from martin-helmich/bug-pep8-fixes

Minor PEP8 fixes
Enable external YUM repo mirroring through a proxy server.

Also needed to fix some warnings from 'make qa'.
Merge branch 'master' of https://github.com/cobbler/cobbler