ENH: more wisdom
Merge pull request #848 from dengemann/travis

ENH: more wisdom