uncomment makeDataSource import [1303]
More listADDEImages changes. [1303]

* If "unit" parameter is specified, use that to filter list of results.
This one may be a bit controversial…

* Converting Java strings to Jython strings in an effort to avoid the
"u'asdf'" thing. I'm not thrilled with having to do this, but
presenting the user with what appears to be a random mix of str and
unicode objects isn't acceptable.

* Resulting dictionaries now contain "unit" and "unitList" keys and
their respective values.