add media descriptors

http://manage.dimagi.com/default.asp?87176#783840

Don't merge until the questions raised in the case have been answered.
Indentation bothers me.. Should line up the dict keys.