Changed the type of Architecture to ControlledVocabularyStringType. Removed ArchitectureType and ArchitectureTypeEnum. Resolves #49