making logical operators syntax consistent with torch
Merge branch 'master' of github.com:torch/cutorch

Conflicts:
	test/test.lua