Merging conflicts
Merge branch 'pedrovma-spreg_up'
Merge branch 'master' of https://github.com/pysal/pysal
Doing Pep8 again
Merge pull request #454 from pastephens/foobar

Foobar