putting some modifications back in that were overwritten in previous commit
putting some modifications back in that were overwritten in previous commit

mdhaber/scipy,WarrenWeckesser/scipy,ilayn/scipy,FRidh/scipy,pizzathief/scipy,WillieMaddox/scipy,dominicelse/scipy,andim/scipy,raoulbq/scipy,endolith/scipy,aeklant/scipy,Newman101/scipy,cpaulik/scipy,zxsted/scipy,raoulbq/scipy,hainm/scipy,apbard/scipy,Newman101/scipy,minhlongdo/scipy,chatcannon/scipy,ChanderG/scipy,vanpact/scipy,pbrod/scipy,matthew-brett/scipy,behzadnouri/scipy,argriffing/scipy,Kamp9/scipy,FRidh/scipy,vhaasteren/scipy,Kamp9/scipy,FRidh/scipy,jseabold/scipy,richardotis/scipy,pschella/scipy,zerothi/scipy,aman-iitj/scipy,aeklant/scipy,trankmichael/scipy,gef756/scipy,vigna/scipy,petebachant/scipy,mortonjt/scipy,mortada/scipy,mingwpy/scipy,piyush0609/scipy,behzadnouri/scipy,mortonjt/scipy,efiring/scipy,Gillu13/scipy,jseabold/scipy,sriki18/scipy,nvoron23/scipy,gertingold/scipy,ndchorley/scipy,chatcannon/scipy,newemailjdm/scipy,jsilter/scipy,cpaulik/scipy,pyramania/scipy,Kamp9/scipy,mtrbean/scipy,anntzer/scipy,e-q/scipy,felipebetancur/scipy,bkendzior/scipy,aarchiba/scipy,maciejkula/scipy,gfyoung/scipy,mtrbean/scipy,nmayorov/scipy,jsilter/scipy,cpaulik/scipy,arokem/scipy,lukauskas/scipy,ales-erjavec/scipy,jamestwebber/scipy,trankmichael/scipy,matthew-brett/scipy,gdooper/scipy,andyfaff/scipy,tylerjereddy/scipy,mgaitan/scipy,jonycgn/scipy,zerothi/scipy,vanpact/scipy,kalvdans/scipy,pbrod/scipy,surhudm/scipy,lukauskas/scipy,behzadnouri/scipy,gdooper/scipy,petebachant/scipy,pschella/scipy,hainm/scipy,ilayn/scipy,vberaudi/scipy,Stefan-Endres/scipy,nmayorov/scipy,FRidh/scipy,endolith/scipy,Stefan-Endres/scipy,giorgiop/scipy,bkendzior/scipy,jseabold/scipy,pyramania/scipy,trankmichael/scipy,Eric89GXL/scipy,efiring/scipy,Newman101/scipy,mortada/scipy,ilayn/scipy,sriki18/scipy,ales-erjavec/scipy,person142/scipy,woodscn/scipy,woodscn/scipy,dominicelse/scipy,chatcannon/scipy,zerothi/scipy,Stefan-Endres/scipy,rmcgibbo/scipy,perimosocordiae/scipy,Gillu13/scipy,trankmichael/scipy,zxsted/scipy,hainm/scipy,niknow/scipy,sargas/scipy,nvoron23/scipy,giorgiop/scipy,rmcgibbo/scipy,andim/scipy,felipebetancur/scipy,pizzathief/scipy,witcxc/scipy,matthewalbani/scipy,WarrenWeckesser/scipy,jakevdp/scipy,petebachant/scipy,Stefan-Endres/scipy,mtrbean/scipy,giorgiop/scipy,Eric89GXL/scipy,tylerjereddy/scipy,Newman101/scipy,hainm/scipy,ndchorley/scipy,sriki18/scipy,tylerjereddy/scipy,kleskjr/scipy,Dapid/scipy,larsmans/scipy,njwilson23/scipy,maciejkula/scipy,mdhaber/scipy,scipy/scipy,jamestwebber/scipy,mgaitan/scipy,sonnyhu/scipy,befelix/scipy,kleskjr/scipy,jonycgn/scipy,aarchiba/scipy,gef756/scipy,anielsen001/scipy,trankmichael/scipy,juliantaylor/scipy,pizzathief/scipy,anielsen001/scipy,maniteja123/scipy,pschella/scipy,jonycgn/scipy,haudren/scipy,ogrisel/scipy,andyfaff/scipy,Kamp9/scipy,sriki18/scipy,jonycgn/scipy,sonnyhu/scipy,mhogg/scipy,rmcgibbo/scipy,vigna/scipy,jsilter/scipy,vberaudi/scipy,giorgiop/scipy,njwilson23/scipy,nonhermitian/scipy,lukauskas/scipy,pizzathief/scipy,bkendzior/scipy,hainm/scipy,mikebenfield/scipy,arokem/scipy,gertingold/scipy,lhilt/scipy,sonnyhu/scipy,e-q/scipy,newemailjdm/scipy,perimosocordiae/scipy,jakevdp/scipy,maciejkula/scipy,larsmans/scipy,andyfaff/scipy,Newman101/scipy,pnedunuri/scipy,ales-erjavec/scipy,nmayorov/scipy,fernand/scipy,josephcslater/scipy,piyush0609/scipy,pbrod/scipy,fernand/scipy,vhaasteren/scipy,jsilter/scipy,vanpact/scipy,newemailjdm/scipy,richardotis/scipy,minhlongdo/scipy,efiring/scipy,mortada/scipy,rgommers/scipy,kleskjr/scipy,zerothi/scipy,efiring/scipy,juliantaylor/scipy,haudren/scipy,aman-iitj/scipy,aman-iitj/scipy,WarrenWeckesser/scipy,futurulus/scipy,Shaswat27/scipy,richardotis/scipy,sonnyhu/scipy,niknow/scipy,efiring/scipy,jor-/scipy,felipebetancur/scipy,zaxliu/scipy,efiring/scipy,dch312/scipy,haudren/scipy,tylerjereddy/scipy,person142/scipy,josephcslater/scipy,jamestwebber/scipy,pbrod/scipy,anntzer/scipy,perimosocordiae/scipy,futurulus/scipy,gfyoung/scipy,Eric89GXL/scipy,mikebenfield/scipy,zaxliu/scipy,Srisai85/scipy,WillieMaddox/scipy,ChanderG/scipy,Gillu13/scipy,piyush0609/scipy,surhudm/scipy,gef756/scipy,vberaudi/scipy,larsmans/scipy,matthew-brett/scipy,apbard/scipy,mhogg/scipy,kalvdans/scipy,vigna/scipy,maciejkula/scipy,futurulus/scipy,larsmans/scipy,WarrenWeckesser/scipy,ortylp/scipy,juliantaylor/scipy,pnedunuri/scipy,pyramania/scipy,gdooper/scipy,endolith/scipy,endolith/scipy,zaxliu/scipy,sauliusl/scipy,dch312/scipy,nvoron23/scipy,Shaswat27/scipy,petebachant/scipy,pbrod/scipy,gdooper/scipy,jseabold/scipy,Kamp9/scipy,Kamp9/scipy,lhilt/scipy,e-q/scipy,teoliphant/scipy,Shaswat27/scipy,ndchorley/scipy,mingwpy/scipy,nmayorov/scipy,pyramania/scipy,mdhaber/scipy,bkendzior/scipy,sargas/scipy,mingwpy/scipy,scipy/scipy,grlee77/scipy,giorgiop/scipy,mhogg/scipy,fernand/scipy,pyramania/scipy,mgaitan/scipy,vanpact/scipy,niknow/scipy,WillieMaddox/scipy,njwilson23/scipy,perimosocordiae/scipy,zxsted/scipy,nonhermitian/scipy,jor-/scipy,Gillu13/scipy,piyush0609/scipy,jakevdp/scipy,jakevdp/scipy,newemailjdm/scipy,Eric89GXL/scipy,jamestwebber/scipy,kalvdans/scipy,aeklant/scipy,teoliphant/scipy,njwilson23/scipy,apbard/scipy,dominicelse/scipy,jjhelmus/scipy,pnedunuri/scipy,fredrikw/scipy,petebachant/scipy,argriffing/scipy,sauliusl/scipy,larsmans/scipy,sargas/scipy,perimosocordiae/scipy,zaxliu/scipy,rgommers/scipy,Dapid/scipy,matthewalbani/scipy,njwilson23/scipy,ChanderG/scipy,jseabold/scipy,andyfaff/scipy,ortylp/scipy,mortada/scipy,argriffing/scipy,chatcannon/scipy,andyfaff/scipy,woodscn/scipy,fredrikw/scipy,mtrbean/scipy,giorgiop/scipy,behzadnouri/scipy,scipy/scipy,maniteja123/scipy,mtrbean/scipy,surhudm/scipy,ogrisel/scipy,juliantaylor/scipy,zxsted/scipy,befelix/scipy,newemailjdm/scipy,juliantaylor/scipy,WarrenWeckesser/scipy,fredrikw/scipy,jjhelmus/scipy,andim/scipy,aman-iitj/scipy,matthew-brett/scipy,fredrikw/scipy,argriffing/scipy,petebachant/scipy,rgommers/scipy,ogrisel/scipy,sauliusl/scipy,jjhelmus/scipy,person142/scipy,mgaitan/scipy,e-q/scipy,minhlongdo/scipy,maniteja123/scipy,surhudm/scipy,matthewalbani/scipy,gertingold/scipy,mhogg/scipy,ChanderG/scipy,mdhaber/scipy,ndchorley/scipy,rmcgibbo/scipy,mingwpy/scipy,andim/scipy,zaxliu/scipy,bkendzior/scipy,ales-erjavec/scipy,surhudm/scipy,njwilson23/scipy,Stefan-Endres/scipy,mikebenfield/scipy,sauliusl/scipy,befelix/scipy,niknow/scipy,hainm/scipy,ilayn/scipy,vhaasteren/scipy,Stefan-Endres/scipy,argriffing/scipy,jor-/scipy,rgommers/scipy,josephcslater/scipy,witcxc/scipy,maniteja123/scipy,dominicelse/scipy,gfyoung/scipy,zaxliu/scipy,anielsen001/scipy,gef756/scipy,witcxc/scipy,gef756/scipy,woodscn/scipy,mingwpy/scipy,jonycgn/scipy,scipy/scipy,cpaulik/scipy,andyfaff/scipy,richardotis/scipy,ortylp/scipy,sauliusl/scipy,fernand/scipy,minhlongdo/scipy,apbard/scipy,kleskjr/scipy,Gillu13/scipy,niknow/scipy,nvoron23/scipy,teoliphant/scipy,piyush0609/scipy,Srisai85/scipy,kalvdans/scipy,witcxc/scipy,mortonjt/scipy,sriki18/scipy,sriki18/scipy,mortonjt/scipy,lukauskas/scipy,cpaulik/scipy,vberaudi/scipy,pnedunuri/scipy,mortonjt/scipy,chatcannon/scipy,WillieMaddox/scipy,nvoron23/scipy,Srisai85/scipy,lukauskas/scipy,sonnyhu/scipy,sargas/scipy,Dapid/scipy,anielsen001/scipy,gdooper/scipy,aeklant/scipy,Eric89GXL/scipy,mortada/scipy,andim/scipy,mikebenfield/scipy,raoulbq/scipy,mhogg/scipy,mingwpy/scipy,niknow/scipy,arokem/scipy,dch312/scipy,anielsen001/scipy,haudren/scipy,jakevdp/scipy,felipebetancur/scipy,e-q/scipy,Srisai85/scipy,tylerjereddy/scipy,lhilt/scipy,FRidh/scipy,felipebetancur/scipy,person142/scipy,aman-iitj/scipy,aman-iitj/scipy,nmayorov/scipy,matthewalbani/scipy,jjhelmus/scipy,grlee77/scipy,Shaswat27/scipy,futurulus/scipy,Newman101/scipy,jor-/scipy,zxsted/scipy,fernand/scipy,aarchiba/scipy,grlee77/scipy,jonycgn/scipy,rmcgibbo/scipy,teoliphant/scipy,pschella/scipy,fernand/scipy,ales-erjavec/scipy,ilayn/scipy,scipy/scipy,josephcslater/scipy,ales-erjavec/scipy,jseabold/scipy,haudren/scipy,WillieMaddox/scipy,grlee77/scipy,rgommers/scipy,mikebenfield/scipy,gfyoung/scipy,vberaudi/scipy,haudren/scipy,raoulbq/scipy,dominicelse/scipy,apbard/scipy,scipy/scipy,larsmans/scipy,andim/scipy,felipebetancur/scipy,gertingold/scipy,woodscn/scipy,WillieMaddox/scipy,mtrbean/scipy,sauliusl/scipy,vberaudi/scipy,gef756/scipy,sonnyhu/scipy,aeklant/scipy,raoulbq/scipy,Dapid/scipy,anntzer/scipy,lhilt/scipy,endolith/scipy,ortylp/scipy,jjhelmus/scipy,anntzer/scipy,Srisai85/scipy,vhaasteren/scipy,fredrikw/scipy,pizzathief/scipy,piyush0609/scipy,minhlongdo/scipy,behzadnouri/scipy,anielsen001/scipy,zerothi/scipy,argriffing/scipy,Dapid/scipy,jsilter/scipy,woodscn/scipy,surhudm/scipy,arokem/scipy,pschella/scipy,vigna/scipy,matthew-brett/scipy,vanpact/scipy,teoliphant/scipy,witcxc/scipy,pnedunuri/scipy,aarchiba/scipy,sargas/scipy,richardotis/scipy,ogrisel/scipy,ndchorley/scipy,befelix/scipy,gertingold/scipy,gfyoung/scipy,Eric89GXL/scipy,raoulbq/scipy,ortylp/scipy,behzadnouri/scipy,nonhermitian/scipy,FRidh/scipy,zxsted/scipy,nonhermitian/scipy,perimosocordiae/scipy,richardotis/scipy,ChanderG/scipy,aarchiba/scipy,mhogg/scipy,befelix/scipy,Srisai85/scipy,ChanderG/scipy,minhlongdo/scipy,mdhaber/scipy,pbrod/scipy,mdhaber/scipy,trankmichael/scipy,anntzer/scipy,matthewalbani/scipy,kalvdans/scipy,ilayn/scipy,dch312/scipy,Gillu13/scipy,Shaswat27/scipy,chatcannon/scipy,ogrisel/scipy,newemailjdm/scipy,arokem/scipy,jamestwebber/scipy,jor-/scipy,maniteja123/scipy,mgaitan/scipy,dch312/scipy,fredrikw/scipy,kleskjr/scipy,maciejkula/scipy,person142/scipy,rmcgibbo/scipy,cpaulik/scipy,pnedunuri/scipy,josephcslater/scipy,lhilt/scipy,Dapid/scipy,vigna/scipy,nonhermitian/scipy,anntzer/scipy,grlee77/scipy,vhaasteren/scipy,mgaitan/scipy,Shaswat27/scipy,maniteja123/scipy,futurulus/scipy,vhaasteren/scipy,lukauskas/scipy,ndchorley/scipy,mortonjt/scipy,endolith/scipy,nvoron23/scipy,vanpact/scipy,mortada/scipy,kleskjr/scipy,futurulus/scipy,zerothi/scipy,WarrenWeckesser/scipy,ortylp/scipy