Finish fixing merge hassles.
Finish fixing merge hassles.

seberg/numpy,argriffing/numpy,Dapid/numpy,b-carter/numpy,NextThought/pypy-numpy,dch312/numpy,sinhrks/numpy,rgommers/numpy,pbrod/numpy,dwillmer/numpy,dwf/numpy,embray/numpy,ekalosak/numpy,mhvk/numpy,joferkington/numpy,immerrr/numpy,BMJHayward/numpy,gfyoung/numpy,jorisvandenbossche/numpy,MaPePeR/numpy,numpy/numpy,ViralLeadership/numpy,ajdawson/numpy,mindw/numpy,KaelChen/numpy,sinhrks/numpy,ajdawson/numpy,ChristopherHogan/numpy,MichaelAquilina/numpy,cowlicks/numpy,pelson/numpy,dimasad/numpy,astrofrog/numpy,leifdenby/numpy,bmorris3/numpy,larsmans/numpy,jschueller/numpy,mortada/numpy,larsmans/numpy,rhythmsosad/numpy,mathdd/numpy,brandon-rhodes/numpy,jschueller/numpy,ddasilva/numpy,mindw/numpy,stuarteberg/numpy,BabeNovelty/numpy,cjermain/numpy,cjermain/numpy,charris/numpy,Eric89GXL/numpy,tynn/numpy,WarrenWeckesser/numpy,numpy/numpy,jakirkham/numpy,MichaelAquilina/numpy,rgommers/numpy,cowlicks/numpy,rherault-insa/numpy,mortada/numpy,Yusa95/numpy,mwiebe/numpy,grlee77/numpy,ssanderson/numpy,ogrisel/numpy,has2k1/numpy,rgommers/numpy,joferkington/numpy,MaPePeR/numpy,MSeifert04/numpy,CMartelLML/numpy,simongibbons/numpy,pizzathief/numpy,chatcannon/numpy,mhvk/numpy,nbeaver/numpy,Eric89GXL/numpy,ewmoore/numpy,groutr/numpy,ogrisel/numpy,AustereCuriosity/numpy,mattip/numpy,shoyer/numpy,Linkid/numpy,ESSS/numpy,has2k1/numpy,matthew-brett/numpy,madphysicist/numpy,bringingheavendown/numpy,bertrand-l/numpy,embray/numpy,WillieMaddox/numpy,astrofrog/numpy,rmcgibbo/numpy,shoyer/numpy,cjermain/numpy,ssanderson/numpy,jankoslavic/numpy,ewmoore/numpy,skymanaditya1/numpy,ChristopherHogan/numpy,dato-code/numpy,rgommers/numpy,KaelChen/numpy,musically-ut/numpy,Anwesh43/numpy,madphysicist/numpy,GrimDerp/numpy,MaPePeR/numpy,charris/numpy,mhvk/numpy,shoyer/numpy,madphysicist/numpy,bertrand-l/numpy,SiccarPoint/numpy,rmcgibbo/numpy,bmorris3/numpy,bertrand-l/numpy,grlee77/numpy,SiccarPoint/numpy,mingwpy/numpy,shoyer/numpy,tdsmith/numpy,endolith/numpy,CMartelLML/numpy,pelson/numpy,embray/numpy,NextThought/pypy-numpy,ahaldane/numpy,pizzathief/numpy,behzadnouri/numpy,mindw/numpy,GrimDerp/numpy,GaZ3ll3/numpy,jonathanunderwood/numpy,kiwifb/numpy,brandon-rhodes/numpy,SunghanKim/numpy,gfyoung/numpy,b-carter/numpy,dwf/numpy,jakirkham/numpy,andsor/numpy,pdebuyl/numpy,leifdenby/numpy,musically-ut/numpy,matthew-brett/numpy,sigma-random/numpy,jorisvandenbossche/numpy,ajdawson/numpy,cjermain/numpy,Yusa95/numpy,embray/numpy,pelson/numpy,Yusa95/numpy,musically-ut/numpy,chatcannon/numpy,tdsmith/numpy,grlee77/numpy,trankmichael/numpy,trankmichael/numpy,yiakwy/numpy,maniteja123/numpy,mingwpy/numpy,gmcastil/numpy,njase/numpy,ahaldane/numpy,naritta/numpy,pelson/numpy,nguyentu1602/numpy,stuarteberg/numpy,andsor/numpy,sigma-random/numpy,mattip/numpy,SiccarPoint/numpy,andsor/numpy,abalkin/numpy,Anwesh43/numpy,abalkin/numpy,githubmlai/numpy,hainm/numpy,Dapid/numpy,WarrenWeckesser/numpy,Dapid/numpy,simongibbons/numpy,yiakwy/numpy,larsmans/numpy,tacaswell/numpy,nguyentu1602/numpy,rhythmsosad/numpy,embray/numpy,jakirkham/numpy,endolith/numpy,stuarteberg/numpy,pyparallel/numpy,joferkington/numpy,madphysicist/numpy,skwbc/numpy,jschueller/numpy,ekalosak/numpy,dato-code/numpy,GaZ3ll3/numpy,empeeu/numpy,dch312/numpy,numpy/numpy,numpy/numpy-refactor,njase/numpy,kiwifb/numpy,rhythmsosad/numpy,dch312/numpy,nguyentu1602/numpy,ogrisel/numpy,anntzer/numpy,BabeNovelty/numpy,mathdd/numpy,jakirkham/numpy,felipebetancur/numpy,cowlicks/numpy,pbrod/numpy,bringingheavendown/numpy,shoyer/numpy,jakirkham/numpy,ViralLeadership/numpy,ajdawson/numpy,mindw/numpy,githubmlai/numpy,matthew-brett/numpy,astrofrog/numpy,anntzer/numpy,utke1/numpy,mathdd/numpy,moreati/numpy,nguyentu1602/numpy,skymanaditya1/numpy,Anwesh43/numpy,tdsmith/numpy,sigma-random/numpy,kiwifb/numpy,pizzathief/numpy,skymanaditya1/numpy,Eric89GXL/numpy,ContinuumIO/numpy,rajathkumarmp/numpy,anntzer/numpy,MSeifert04/numpy,mathdd/numpy,cowlicks/numpy,tdsmith/numpy,BMJHayward/numpy,empeeu/numpy,ESSS/numpy,CMartelLML/numpy,charris/numpy,ChanderG/numpy,stefanv/numpy,MichaelAquilina/numpy,dwillmer/numpy,pizzathief/numpy,Linkid/numpy,pelson/numpy,nbeaver/numpy,rmcgibbo/numpy,dch312/numpy,naritta/numpy,musically-ut/numpy,naritta/numpy,simongibbons/numpy,githubmlai/numpy,WarrenWeckesser/numpy,has2k1/numpy,jonathanunderwood/numpy,astrofrog/numpy,Linkid/numpy,rajathkumarmp/numpy,BMJHayward/numpy,pyparallel/numpy,behzadnouri/numpy,gmcastil/numpy,Linkid/numpy,mhvk/numpy,rudimeier/numpy,seberg/numpy,NextThought/pypy-numpy,naritta/numpy,ChristopherHogan/numpy,jorisvandenbossche/numpy,chiffa/numpy,mortada/numpy,pdebuyl/numpy,kirillzhuravlev/numpy,BMJHayward/numpy,ssanderson/numpy,Eric89GXL/numpy,moreati/numpy,kirillzhuravlev/numpy,simongibbons/numpy,WillieMaddox/numpy,ewmoore/numpy,tynn/numpy,rudimeier/numpy,b-carter/numpy,jorisvandenbossche/numpy,moreati/numpy,tacaswell/numpy,dwillmer/numpy,joferkington/numpy,dimasad/numpy,dwf/numpy,BabeNovelty/numpy,immerrr/numpy,maniteja123/numpy,jankoslavic/numpy,chiffa/numpy,solarjoe/numpy,ekalosak/numpy,jorisvandenbossche/numpy,MichaelAquilina/numpy,dimasad/numpy,trankmichael/numpy,Srisai85/numpy,tynn/numpy,Srisai85/numpy,jschueller/numpy,SunghanKim/numpy,utke1/numpy,sonnyhu/numpy,ewmoore/numpy,GaZ3ll3/numpy,grlee77/numpy,chiffa/numpy,endolith/numpy,GrimDerp/numpy,argriffing/numpy,charris/numpy,pdebuyl/numpy,dwillmer/numpy,drasmuss/numpy,sinhrks/numpy,mortada/numpy,stefanv/numpy,seberg/numpy,SunghanKim/numpy,pbrod/numpy,dato-code/numpy,pizzathief/numpy,BabeNovelty/numpy,abalkin/numpy,sigma-random/numpy,pbrod/numpy,hainm/numpy,SiccarPoint/numpy,ddasilva/numpy,KaelChen/numpy,Anwesh43/numpy,AustereCuriosity/numpy,numpy/numpy-refactor,drasmuss/numpy,dimasad/numpy,mattip/numpy,jankoslavic/numpy,MSeifert04/numpy,rajathkumarmp/numpy,ContinuumIO/numpy,has2k1/numpy,anntzer/numpy,nbeaver/numpy,chatcannon/numpy,leifdenby/numpy,mingwpy/numpy,rherault-insa/numpy,solarjoe/numpy,endolith/numpy,WarrenWeckesser/numpy,ekalosak/numpy,SunghanKim/numpy,bmorris3/numpy,ahaldane/numpy,Srisai85/numpy,sonnyhu/numpy,MSeifert04/numpy,drasmuss/numpy,stefanv/numpy,groutr/numpy,dato-code/numpy,immerrr/numpy,skwbc/numpy,sonnyhu/numpy,utke1/numpy,matthew-brett/numpy,ahaldane/numpy,WillieMaddox/numpy,brandon-rhodes/numpy,matthew-brett/numpy,ahaldane/numpy,jonathanunderwood/numpy,rudimeier/numpy,felipebetancur/numpy,stefanv/numpy,bmorris3/numpy,simongibbons/numpy,yiakwy/numpy,mwiebe/numpy,empeeu/numpy,rmcgibbo/numpy,felipebetancur/numpy,numpy/numpy-refactor,empeeu/numpy,mhvk/numpy,seberg/numpy,pyparallel/numpy,sonnyhu/numpy,astrofrog/numpy,Yusa95/numpy,githubmlai/numpy,behzadnouri/numpy,ogrisel/numpy,solarjoe/numpy,tacaswell/numpy,mattip/numpy,hainm/numpy,trankmichael/numpy,jankoslavic/numpy,numpy/numpy,grlee77/numpy,ddasilva/numpy,dwf/numpy,skymanaditya1/numpy,rudimeier/numpy,mingwpy/numpy,numpy/numpy-refactor,GaZ3ll3/numpy,Srisai85/numpy,MaPePeR/numpy,pdebuyl/numpy,argriffing/numpy,gmcastil/numpy,ContinuumIO/numpy,numpy/numpy-refactor,gfyoung/numpy,skwbc/numpy,ChristopherHogan/numpy,ogrisel/numpy,felipebetancur/numpy,brandon-rhodes/numpy,CMartelLML/numpy,hainm/numpy,ewmoore/numpy,ChanderG/numpy,rhythmsosad/numpy,rajathkumarmp/numpy,larsmans/numpy,WarrenWeckesser/numpy,dwf/numpy,ESSS/numpy,yiakwy/numpy,GrimDerp/numpy,rherault-insa/numpy,AustereCuriosity/numpy,kirillzhuravlev/numpy,sinhrks/numpy,madphysicist/numpy,kirillzhuravlev/numpy,njase/numpy,KaelChen/numpy,mwiebe/numpy,bringingheavendown/numpy,ChanderG/numpy,stefanv/numpy,maniteja123/numpy,pbrod/numpy,groutr/numpy,MSeifert04/numpy,NextThought/pypy-numpy,ViralLeadership/numpy,stuarteberg/numpy,ChanderG/numpy,immerrr/numpy,andsor/numpy