BUG: fixes from review
BUG: fixes from review

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