BUG: fixes from review
BUG: fixes from review

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