Changed the keying of EnumerationProperty options

Now uses the option-value as the key rather than the option-label