diff --git a/.gitignore b/.gitignore
index 7d8d699..894a44c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,35 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
 
 # Distribution / packaging
 .Python
-env/
-bin/
 build/
 develop-eggs/
 dist/
+downloads/
 eggs/
+.eggs/
 lib/
 lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
 
 # Installer logs
 pip-log.txt
@@ -30,28 +39,66 @@ pip-delete-this-directory.txt
 htmlcov/
 .tox/
 .coverage
+.coverage.*
 .cache
 nosetests.xml
 coverage.xml
-coverage_html
+*.cover
+.hypothesis/
+.pytest_cache/
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Rope
-.ropeproject
+# Translations
+*.mo
+*.pot
 
 # Django stuff:
 *.log
-*.pot
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
 docs/_build/
 
-.DS_Store
-db.sqlite3
+# PyBuilder
+target/
 
-# IntelliJ IDE files
-.idea
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
diff --git a/flake8 b/flake8
deleted file mode 100644
index 401fdf4..0000000
--- a/flake8
+++ /dev/null
@@ -1,4 +0,0 @@
-[flake8]
-max-line-length = 120
-exclude = docs/*,demo/*
-ignore = F403
\ No newline at end of file
diff --git a/.coveragerc b/setup.cfg
similarity index 70%
rename from .coveragerc
rename to setup.cfg
index 70d6d0d..8d915a7 100644
--- a/.coveragerc
+++ b/setup.cfg
@@ -1,8 +1,21 @@
-# .coveragerc to control coverage.py
-[run]
+[bdist_wheel]
+universal = 1
+
+
+[metadata]
+license_file = LICENSE
+
+
+[flake8]
+max-line-length = 120
+exclude = docs/*,demo/*
+ignore = F403
+
+
+[coverage:run]
 omit=*site-packages*,*distutils*,*migrations*
 
-[report]
+[coverage:report]
 # Regexes for lines to exclude from consideration
 exclude_lines =
     # Have to re-enable the standard pragma
@@ -22,5 +35,5 @@ exclude_lines =
 
 ignore_errors = True
 
-[html]
-directory = coverage_html
\ No newline at end of file
+[coverage:html]
+directory = coverage_html
diff --git a/setup.py b/setup.py
index 2c9dad4..66c4c04 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,8 @@
 #!/usr/bin/env python
 
-try:
-    from setuptools import setup, find_packages
-except ImportError:
-    from ez_setup import use_setuptools
-    use_setuptools()
-    from setuptools import setup, find_packages
-
-
 import os
+from setuptools import setup, find_packages
+
 
 here = os.path.dirname(os.path.abspath(__file__))
 f = open(os.path.join(here, 'README.rst'))