Merge pull request #40 from mdpiper/master

Improvements to model access and label system
Fix error in ModelMetadataJSOTest