Merge pull request #360 from jcrocholl/issue-316

Add E121 and E126 to the DEFAULT_IGNORE list

diff --cc CHANGES.txt
Simple merge

diff --cc docs/intro.rst
Simple merge

diff --cc pep8.py
index a2e718b0e8a367f651e7ae2aa86724dba14f16fd,6c51733bf3fa5f9602a92b5b860eeae1b3e34be7..940a2724050f88b40730f0dd62c0c42cb1161844
--- 1/pep8.py
--- 2/pep8.py
+++ b/pep8.py
@@@ -62,10 -64,8 +62,10 @@@ try
  except ImportError:
      from ConfigParser import RawConfigParser
  
 +__version__ = '1.6.0a0'
 +
  DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
- DEFAULT_IGNORE = 'E123,E226,E24,E704'
+ DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704'
  try:
      if sys.platform == 'win32':
          DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')