edx/edx-platform — pull request #2997 by jzoldak (2014-03-20 14:19:13+00:00)
Title: Fix pylint disable pragmas that were pep8 violations

@andy-armstrong