Merge pull request #531 from ndawe/master

[MRG] switch from distribute to setuptools >= 0.7