BUG: Identified bug with numpy 1.7 ufunc operators

Replaces messy #1052