Added RPicSim

And a few merge commits.  Oh well.