diff --git a/.gitignore b/.gitignore
index b43bb7b3..011ac1c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ develop-eggs
 .installed.cfg
 lib
 lib64
+pip-wheel-metadata
 venv*
 
 # Installer logs
@@ -55,34 +56,10 @@ chains
 
 # tox/pytest cache
 .cache
+.pytest_cache
 
 # Test output logs
 logs
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
 
 # VIM temp files
 *.sw[op]
@@ -90,24 +67,32 @@ logs
 # mypy
 .mypy_cache
 
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# For a more precise, explicit template, see:
+# https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+## General
+.idea/*
+.idea_modules/*
+
 ## File-based project format:
 *.iws
 
-## Plugin-specific files:
+## IntelliJ
+out/
 
-# IntelliJ
-/out/
-.idea*
+## Plugin-specific files:
 
-#pip wheel metadata
-pip-wheel-metadata
+### mpeltonen/sbt-idea plugin
+.idea_modules/
 
-# JIRA plugin
+### JIRA plugin
 atlassian-ide-plugin.xml
 
-# Crashlytics plugin (for Android Studio and IntelliJ)
+### Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+# END JetBrains section
diff --git a/setup.py b/setup.py
index 3e3cdf05..2b8c7201 100644
--- a/setup.py
+++ b/setup.py
@@ -15,11 +15,11 @@
         "flake8==3.7.9",
         "isort>=4.2.15,<5",
         "mypy==0.770",
-        "pydocstyle>=3.0.0,<4",
+        "pydocstyle>=5.0.0,<6",
     ],
     'doc': [
         "Sphinx>=1.6.5,<2",
-        "sphinx_rtd_theme>=0.1.9",
+        "sphinx_rtd_theme>=0.1.9,<1",
         "towncrier>=19.2.0, <20",
     ],
     'dev': [
@@ -70,6 +70,8 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
+        'Operating System :: MacOS',
+        'Operating System :: POSIX',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',