merging in trunk of https://code.google.com/p/scipy-sim/ (scipy-sim-693c288d5b9c.zip)