BUG: fixes from review
BUG: fixes from review

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