Fixed, refactored compare and binary ops after merge.
Fixed, refactored compare and binary ops after merge.

teoliphant/numpy-refactor,teoliphant/numpy-refactor,teoliphant/numpy-refactor,teoliphant/numpy-refactor,teoliphant/numpy-refactor