Merge branch 'master' into api-key-env

Author: Samuel Scully

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+max-line-length = 120
+exclude = .git,__pycache__,build,dist
+ignore = W503
+per-file-ignores =
+    __init__.py: F401