Revert "applying updates from revision of 10/10/2013 r3679 to pandora/item/models.py"

This reverts commit a7379647c1052e1163034cb31ac515e21cb10ebc.
Revert "Revert "applying updates from revision of 10/10/2013 r3679 to pandora/item/models.py""

This reverts commit 5e289e46816fa20510887beba940f68004b2438d.
Revert "Revert "Revert "applying updates from revision of 10/10/2013 r3679 to pandora/item/models.py"""

This reverts commit 1df6ffbf3189eb61dab076230e3747420139ea50.