Merge pull request #137 from ndawe/master

[MRG] Use setuptools if installed