First pass at a better enum a la #130
Error formatting convenience function.
Cuttlefish Enum changes

includes fix for basho/riak#515