merge in the gemstone work from dalehenrich/stone

Now bring across the gemstone branch with the recent port that Paul DeBruicker and I worked on ...