Add option to skip ndim=1 for axis is not None

With this change, the existing bottleneck test suite passes.