Added start of a test for curation_record.  Added some temporary cleanup
for unfinished tests.
Create derived scopes for referencing in simpl_scope annotations.
resolve ambiguity when calling SimplTypesScope.get(), so that javac 1.7
stops complaining.
Merging in master... I think