REF Tiny speed up
TST Make new tests independent of numpy version.
Merge branch 'master' of https://github.com/kwgoodman/bottleneck

Conflicts:
	bottleneck/tests/func_test.py