added conv2d comment to nnet.__init__

theano/tensor/nnet/__init__.py

 from nnet import *
+#from conv import conv2d, ConvOp # causes circular import
 from Conv3D import *
 from ConvGrad3D import *
 from ConvTransp3D import *