add media descriptors

http://manage.dimagi.com/default.asp?87176#783840

Don't merge until the questions raised in the case have been answered.
Since `descriptor` goes to a string field, would `''` be preferred to `None`? (Note: just speculating, not sure what convention/preference is for this)