merge (take two)

_test_tensor_opt.py

@@ -100,7 +100,7 @@ class _test_dimshuffle_lift(unittest.TestCase):
 
 from tensor import *
 
-from sandbox  import pprint
+#from sandbox import pprint
 
 class _test_greedy_distribute(unittest.TestCase):
     def test_main(self):

tensor.py

@@ -1418,7 +1418,6 @@ def concatenate(tensors, axis=0):
     if not hasattr(concatenate, 'obj'):
         concatenate.obj = Concatenate()
     return concatenate.obj(axis, *tensors)
->>>>>>> /tmp/tensor.py~other.Lj6QeV
 
 class VerticalStack(Op):
     """