Fixed failing test caused by changed scipy behaviour
Disabled some tests for travis
Fixed .travis.yml, again.
ENH: Small fixes in docs
Rewrote the example using a generative model
ENH: mostly cosmetic to improve examples