Fixing syntax error

running install_lib
byte-compiling /usr/lib/python2.6/site-packages/ansible/runner/action_plugins/add_host.py to add_host.pyc
SyntaxError: ('invalid syntax', ('/usr/lib/python2.6/site-packages/ansible/runner/action_plugins/add_host.py', 37, 92, '    def run(self, conn, tmp, module_name, module_args, inject, complex_args=None, **kwargs)\n'))
Show a nicer message when attempting to diff unicode files.
Merge pull request #2112 from kavink/devel

Fixing syntax error
Merge pull request #2113 from johanwiren/zfs

zfs: documentation no longer breaks the formatting in webdocs
Fixes from 'make pep8'.  Partial, more to come.