BUG: fixes from review
BUG: fixes from review

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