Don't change py_name when options conflict, only change cli_name.  Generate new docs for swf commands.  Fix a typo in README.