GPII-341, GPII-342: Updated ontology, solution registry, etc to support the new common terms for pilots #2

We should now support all the common terms of this spreadsheet:

https://docs.google.com/spreadsheet/ccc?key=0AppduB_JZh5EdGltZnF3dVpKdXcxSVhEZ0VjZGY1U3c&usp=drive_web#gid=0