more fixes
more fixes

anntzer/numpy,grlee77/numpy,simongibbons/numpy,mhvk/numpy,jakirkham/numpy,pbrod/numpy,simongibbons/numpy,simongibbons/numpy,grlee77/numpy,pdebuyl/numpy,endolith/numpy,mhvk/numpy,charris/numpy,endolith/numpy,charris/numpy,pbrod/numpy,charris/numpy,numpy/numpy,endolith/numpy,mhvk/numpy,madphysicist/numpy,seberg/numpy,seberg/numpy,seberg/numpy,numpy/numpy,pdebuyl/numpy,mattip/numpy,numpy/numpy,simongibbons/numpy,rgommers/numpy,rgommers/numpy,pdebuyl/numpy,pbrod/numpy,charris/numpy,madphysicist/numpy,pdebuyl/numpy,endolith/numpy,numpy/numpy,jakirkham/numpy,rgommers/numpy,madphysicist/numpy,mhvk/numpy,grlee77/numpy,madphysicist/numpy,grlee77/numpy,seberg/numpy,mattip/numpy,pbrod/numpy,anntzer/numpy,mhvk/numpy,pbrod/numpy,madphysicist/numpy,mattip/numpy,mattip/numpy,jakirkham/numpy,anntzer/numpy,anntzer/numpy,grlee77/numpy,jakirkham/numpy,simongibbons/numpy,rgommers/numpy,jakirkham/numpy