Added info on semantic versioning and branching strategy to CONTRIBUTING.md

Also:
- Added isort to Pipenv dev
- Added setup.cfg to make it easy to run flake8, doc8, and isort directly from the command line without using invoke
- Ran isort to sort includes

1 files changed, 15 insertions, 4 deletions

diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index fdeea9aa..33f75c9e 100755
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -13,16 +13,27 @@ from code import InteractiveConsole
 
 import pytest
 
+import cmd2
+from cmd2 import COMMAND_NAME, ansi, clipboard, constants, exceptions, plugin, utils
+
+from .conftest import (
+    HELP_HISTORY,
+    SHORTCUTS_TXT,
+    SHOW_LONG,
+    SHOW_TXT,
+    complete_tester,
+    normalize,
+    odd_file_names,
+    run_cmd,
+    verify_help_text,
+)
+
 # Python 3.5 had some regressions in the unitest.mock module, so use 3rd party mock if available
 try:
     import mock
 except ImportError:
     from unittest import mock
 
-import cmd2
-from cmd2 import ansi, clipboard, constants, exceptions, plugin, utils, COMMAND_NAME
-from .conftest import (run_cmd, normalize, verify_help_text, HELP_HISTORY, SHORTCUTS_TXT, SHOW_TXT,
-                       SHOW_LONG, complete_tester, odd_file_names)
 
 def CreateOutsimApp():
     c = cmd2.Cmd()