Conflicts:
	theano/tensor/tests/test_opt.py

opt support arbitary dim broadcasting

proper tests

better alloc

remove conficts

pep8 fix