Merge branch 'master' into store_output

Author: kmvanbrunt

CHANGELOG.md

@@ -2,6 +2,7 @@
 * Bug Fixes
     * Fixed bug in how **history** command deals with multiline commands when output to a script
     * Fixed a bug when the ``with_argument_list`` decorator is called with the optional ``preserve_quotes`` argument
+    * Fix bug in ``perror()`` where it would try to print an exception Traceback even if none existed
 * Enhancements
     * Improvements to the **history** command
         * Simplified the display format and made it more similar to **bash**