Remove "text" and "image" from blocktype categories

Bug 1389450
... since they're also present at the top of the block picker.

Change-Id: I758be5c4fd8da81a23bbcf1feecbe89c23b91f9a