diff --git a/pylintrc b/pylintrc
index c6964122c4..069eaecb7c 100644
--- a/pylintrc
+++ b/pylintrc
@@ -2,17 +2,48 @@
 # ** DO NOT EDIT THIS FILE **
 # ***************************
 #
-# It is generated by:
-#   $ edx_lint write pylintrc
+# This file was generated by edx-lint: http://github.com/edx.edx-lint
+#
+# If you want to change this file, you have two choices, depending on whether
+# you want to make a local change that applies only to this repo, or whether
+# you want to make a central change that applies to all repos using edx-lint.
+#
+# LOCAL CHANGE:
+#
+# 1. Edit the local pylintrc_tweaks file to add changes just to this
+#    repo's file.
+#
+# 2. Run:
+#
+#       $ edx_lint write pylintrc
+#
+# 3. This will modify the local file.  Submit a pull request to get it
+#    checked in so that others will benefit.
+#
+#
+# CENTRAL CHANGE:
+#
+# 1. Edit the pylintrc file in the edx-lint repo at
+#    https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc
+#
+# 2. Make a new version of edx_lint, which involves the usual steps of
+#    incrementing the version number, submitting and reviewing a pull
+#    request, and updating the edx-lint version reference in this repo.
+#
+# 3. Install the newer version of edx-lint.
+#
+# 4. Run:
+#
+#       $ edx_lint write pylintrc
+#
+# 5. This will modify the local file.  Submit a pull request to get it
+#    checked in so that others will benefit.
 #
 #
 #
 #
 #
-#
-#
-#
-# STAY AWAY!
+# STAY AWAY FROM THIS FILE!
 #
 #
 #
@@ -22,10 +53,9 @@
 #
 # ------------------------------
 [MASTER]
-profile = no
 ignore = ,migrations
 persistent = yes
-load-plugins = edx_lint.pylint,pylint_django
+load-plugins = edx_lint.pylint,pylint_django,pylint_celery
 
 [MESSAGES CONTROL]
 disable = 
@@ -38,6 +68,7 @@ disable =
 	abstract-class-little-used,
 	no-init,
 	fixme,
+	logging-format-interpolation,
 	too-many-lines,
 	no-self-use,
 	too-many-ancestors,
@@ -56,15 +87,13 @@ output-format = text
 files-output = no
 reports = no
 evaluation = 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-comment = no
 
 [BASIC]
-required-attributes = 
 bad-functions = map,filter,apply,input
 module-rgx = (([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 const-rgx = (([A-Z_][A-Z0-9_]*)|(__.*__)|log|urlpatterns)$
 class-rgx = [A-Z_][a-zA-Z0-9]+$
-function-rgx = ([a-z_][a-z0-9_]{2,30}|test_[a-z0-9_]+)$
+function-rgx = ([a-z_][a-z0-9_]{2,40}|test_[a-z0-9_]+)$
 method-rgx = ([a-z_][a-z0-9_]{2,40}|setUp|set[Uu]pClass|tearDown|tear[Dd]ownClass|assert[A-Z]\w*|maxDiff|test_[a-z0-9_]+)$
 attr-rgx = [a-z_][a-z0-9_]{2,30}$
 argument-rgx = [a-z_][a-z0-9_]{2,30}$
@@ -96,7 +125,6 @@ ignore-imports = no
 [TYPECHECK]
 ignore-mixin-members = yes
 ignored-classes = SQLObject
-zope = no
 unsafe-load-any-extension = yes
 generated-members = 
 	REQUEST,
@@ -127,7 +155,6 @@ dummy-variables-rgx = _|dummy|unused|.*_unused
 additional-builtins = 
 
 [CLASSES]
-ignore-iface-methods = isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 defining-attr-methods = __init__,__new__,setUp
 valid-classmethod-first-arg = cls
 valid-metaclass-classmethod-first-arg = mcs
@@ -153,4 +180,4 @@ int-import-graph =
 [EXCEPTIONS]
 overgeneral-exceptions = Exception
 
-# d1176b1265180b3207835622b1d89b3087196517
+# 22900b2201bd1e9f0050ff51de25691939dc7901
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index a8219f0932..32c66a5250 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -124,7 +124,6 @@ django-cors-headers==1.1.0
 django_debug_toolbar==1.3.2
 
 # Used for testing
-astroid==1.3.8
 before_after==0.1.3
 bok-choy==0.4.7
 chrono==1.0.2
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index b502cbc107..732620447d 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -89,7 +89,7 @@ git+https://github.com/edx/edx-val.git@0.0.8#egg=edxval==0.0.8
 -e git+https://github.com/pmitros/DoneXBlock.git@857bf365f19c904d7e48364428f6b93ff153fabd#egg=done-xblock
 -e git+https://github.com/edx/edx-search.git@release-2015-11-17#egg=edx-search==0.1.1
 -e git+https://github.com/edx/edx-milestones.git@release-2015-11-17#egg=edx-milestones==0.1.5
-git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2
+git+https://github.com/edx/edx-lint.git@v0.4.1#egg=edx_lint==0.4.1
 git+https://github.com/edx/xblock-utils.git@v1.0.0#egg=xblock-utils==v1.0.0
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index c0f49ca21f..44dc7d54de 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -11,7 +11,7 @@ set -e
 ###############################################################################
 
 # Violations thresholds for failing the build
-export PYLINT_THRESHOLD=4700
+export PYLINT_THRESHOLD=4500
 export JSHINT_THRESHOLD=9080
 
 doCheckVars() {