Second pass at custom entity type/bundle definitions. Bundle now has all values defined in the custom bean bundle. Next up, abstracting js and adding map preset field definition.