bulk of it
fix gemstore/store naming issues
Merge pull request #1 from bozcotty/dev

Dev