-r base.txt

coverage==3.7.1
django-nose==1.4.1
factory-boy==2.5.2
flake8==2.4.1
  mccabe==0.3.1
  pep8==1.6.2
  pyflakes==0.9.2
mock==1.1.3
  funcsigs==0.4
  pbr==1.3.0
nose==1.3.7

-r base.txt

coverage==3.7.1
django-nose==1.4.1
factory-boy==2.5.2
flake8==2.4.1
  mccabe==0.3.1
  pep8==1.5.7
  pyflakes==0.8.1
mock==1.1.3
  funcsigs==0.4
  pbr==1.3.0
nose==1.3.7

Use versions of pep8 and pyflakes that are compatible with Flake8
Use versions of pep8 and pyflakes that are compatible with Flake8
