BUG: fixes from review
BUG: fixes from review

rgommers/numpy,rgommers/numpy,numpy/numpy,rgommers/numpy,numpy/numpy,mhvk/numpy,pdebuyl/numpy,anntzer/numpy,mattip/numpy,endolith/numpy,endolith/numpy,anntzer/numpy,jakirkham/numpy,charris/numpy,jakirkham/numpy,jakirkham/numpy,mhvk/numpy,rgommers/numpy,mhvk/numpy,anntzer/numpy,pdebuyl/numpy,charris/numpy,numpy/numpy,mhvk/numpy,mhvk/numpy,numpy/numpy,pdebuyl/numpy,mattip/numpy,seberg/numpy,endolith/numpy,charris/numpy,jakirkham/numpy,pdebuyl/numpy,mattip/numpy,charris/numpy,anntzer/numpy,mattip/numpy,seberg/numpy,jakirkham/numpy,seberg/numpy,endolith/numpy,seberg/numpy