MRG: lots of pep8

lots of pep8 fixes all around

ready for merge

This should lessen this

https://jenkins.shiningpanda-ci.com/scikit-learn/job/python-2.7-numpy-1.6.2-scipy-0.10.1/violations/

a bit hopefully