Change the EBSInstanceBlockStore status to an enum.
Update the EBSBlockDeviceTypes to include GP2. The docs don't allow the value but the Web Console works fine with it. *shrug*