diff --git a/.travis.yml b/.travis.yml
index de7c294..41f9e7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
 language: python
+python: 3.5
 env: # These should match the tox env list
     - TOXENV=py27
-    - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=py35
     - TOXENV=pypy
     - TOXENV=pypy3
 install: pip install coveralls tox
diff --git a/README.md b/README.md
index 6c3a3ec..ee77b25 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,9 @@
     - Use `args: ['--django']` to match `test*.py` instead.
 - `pyflakes` - Run pyflakes on your python files.
 - `pretty-format-json` - Checks that all your JSON files are pretty
-    - Use `args: ['--autofix']` to automatically fixing the encountered not-pretty-formatted files and
-    `args: ['--no-sort-keys']` to disable the sort on the keys.
+    - `--autofix` - automatically format json files
+    - `--no-sort-keys` - when autofixing, retain the original key ordering (instead of sorting the keys)
+    - `--indent ...` - Control the indentation (either a number for a number of spaces or a string of whitespace).
 - `requirements-txt-fixer` - Sorts entries in requirements.txt
 - `trailing-whitespace` - Trims trailing whitespace.
     - Markdown linebreak trailing spaces preserved for `.md` and`.markdown`;
diff --git a/appveyor.yml b/appveyor.yml
index cf8f927..30eab46 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,10 @@
 environment:
     matrix:
         - TOXENV: py27
-        - TOXENV: py34
+        - TOXENV: py35
 
 install:
-    - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
+    - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
     - pip install tox
 
 # Not a C# project
diff --git a/pre_commit_hooks/detect_aws_credentials.py b/pre_commit_hooks/detect_aws_credentials.py
index f727078..4c51546 100644
--- a/pre_commit_hooks/detect_aws_credentials.py
+++ b/pre_commit_hooks/detect_aws_credentials.py
@@ -4,7 +4,7 @@
 import argparse
 import os
 
-from six.moves import configparser  # pylint: disable=import-error
+from six.moves import configparser
 
 
 def get_your_keys(credentials_file):
diff --git a/pylintrc b/pylintrc
deleted file mode 100644
index c905a37..0000000
--- a/pylintrc
+++ /dev/null
@@ -1,22 +0,0 @@
-[MESSAGES CONTROL]
-disable=bad-open-mode,invalid-name,missing-docstring,redefined-outer-name,star-args,locally-disabled,locally-enabled
-
-[REPORTS]
-output-format=colorized
-reports=no
-
-[BASIC]
-const-rgx=(([A-Za-z_][A-Za-z0-9_]*)|(__.*__))$
-
-[FORMAT]
-max-line-length=131
-
-[TYPECHECK]
-ignored-classes=pytest
-
-[DESIGN]
-min-public-methods=0
-
-[SIMILARITIES]
-min-similarity-lines=5
-ignore-imports=yes
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 97343d5..2922ef5 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,9 +1,7 @@
 -e .
 
-astroid<1.3.3
 coverage
 flake8
 mock
 pre-commit
-pylint<1.4
 pytest
diff --git a/setup.py b/setup.py
index e8c5000..f92f821 100644
--- a/setup.py
+++ b/setup.py
@@ -11,20 +11,19 @@
     author='Anthony Sottile',
     author_email='asottile@umich.edu',
 
-    platforms='linux',
     classifiers=[
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 
-    packages=find_packages('.', exclude=('tests*', 'testing*')),
+    packages=find_packages(exclude=('tests*', 'testing*')),
     install_requires=[
         # quickfix to prevent pep8 conflicts
         'flake8!=2.5.3',
diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index 8141ade..f1528b2 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py
@@ -12,9 +12,6 @@
 from testing.util import write_file
 
 
-# pylint:disable=unused-argument
-
-
 @pytest.yield_fixture
 def f1_is_a_conflict_file(tmpdir):
     # Make a merge conflict
diff --git a/tox.ini b/tox.ini
index a9b17c0..f2ac125 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 project = pre_commit_hooks
 # These should match the travis env list
-envlist = py27,py33,py34,pypy,pypy3
+envlist = py27,py34,py35,pypy,pypy3
 
 [testenv]
 deps = -rrequirements-dev.txt
@@ -12,7 +12,6 @@
     coverage report --show-missing --fail-under 100
     pre-commit install -f --install-hooks
     pre-commit run --all-files
-    pylint {[tox]project} testing tests setup.py
 
 [testenv:venv]
 envdir = venv-{[tox]project}