Cleaned up how attributeType and attributeSetType work, also added
custom attributes for attributeOptions
Cleaned up attributeValue object and removed attributeValueType as it is
not needed