Merge pull request #125 from ndawe/master

[MRG] clean up
Merge pull request #126 from ndawe/master

[MRG] bump version to 3.1.1