v2.16.4: Auto merge of #720 - kbknapp:issues-714,718, r=kbknapp

v2.16.4 (2016-10-31)

Improvements

• Error Output: conflicting errors are now symetrical, meaning more consistent and less confusing (3d37001d, closes #718)

Documentation

• Fix typo in example 13a_enum_values_automatic (c22fbc07)
• README.md: fixes failing yaml example (#715) (21fba9e6)

Bug Fixes

• ZSH Completions: fixes bug that caused panic on subcommands with aliases (5c70e1a0, closes #714)
• debug: fixes the debug feature (#716) (6c11ccf4)

v2.16.3 (2016-10-28)

Bug Fixes

• Derive display order after propagation (9cb6facf, closes #706)
• yaml-example: inconsistent args (847f7199)