Merge branch 'master' into 20181212-mfa-sh-doc-update

Author: James Addison

.travis.yml

@@ -13,7 +13,7 @@ matrix:
             addons:
               apt:
                 sources:
-                  - sourceline: 'deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main'
+                  - sourceline: 'ppa:deadsnakes/ppa'
                 packages:
                   - python3.7-dev
 install: pip install tox

setup.cfg

@@ -20,4 +20,4 @@ format=pylint
 max-complexity = 25
 max-line-length = 126
 exclude = .git,__pycache__,venv,tests/
-ignore = E402, E124, W503
+ignore = E402, E124, W503, W504