Changing mask == None to mask is None for better type checking.

[jeinstei]

Using Python 2.7.12 and Numpy 1.13, I was getting errors that a Numpy array can't be compared using a standard "==" operator as an array is not a single element. The "is" operator is supported, and should allow for proper operation.