Resolve array shape edge cases treated differently in Numpy update#1140

aphearin merged 15 commits intomasterastropy/halotools:masterfrom

np_isinastropy/halotools:np_isinCopy head branch name to clipboard