changed short_desc to desc under tk_terms
+data.py w/ Movie classe
changes to caching structure--not quite there yet
resolve merge conflict