hard-merging in the examples and testing dirs from master.

This is probably a dumb way to do it, but I don;t know better.