Major cleanup on Job Roles. Trying to utilize the Entity API for more than just Role Types.