Clean up some PEP8 stuff
Merge pull request #4612 from basepi/jinjafix4236

Clean up some PEP8 stuff