Fix some PEP8 formatting issues
Manually print 'changes' dicts to get newlines in strings
Merge pull request #4317 from basepi/hsoutput3197

Manually print highstate 'changes' dicts to preserve newlines in strings