update list_plot to take care of ndarrays of ndarrays in numpy
merge divergent branches