Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tool_lib/util.py

tool_lib/util.py

@@ -36,9 +36,6 @@ import scipy.stats
 import tabulate
 from scipy.ndimage import zoom
 
-# from tool_lib import stack_tracer, print_exc_plus
-# from tool_lib.my_logger import logging
-
 X = Y = Z = float