trigsimp cleanup
trigsimp cleanup

1) don't let the final rewriting (and factoring) change
expressions that don't have trig expressions in them

2) the rewriting uses the deep flag so it will not occur
within functions and other such objects which are deemed
"deep".

lindsayad/sympy,AunShiLord/sympy,Titan-C/sympy,kumarkrishna/sympy,shipci/sympy,kmacinnis/sympy,beni55/sympy,emon10005/sympy,mcdaniel67/sympy,emon10005/sympy,ga7g08/sympy,bukzor/sympy,Curious72/sympy,moble/sympy,Gadal/sympy,skidzo/sympy,sahilshekhawat/sympy,Gadal/sympy,jerli/sympy,abhiii5459/sympy,lindsayad/sympy,maniteja123/sympy,farhaanbukhsh/sympy,amitjamadagni/sympy,chaffra/sympy,oliverlee/sympy,beni55/sympy,dqnykamp/sympy,wanglongqi/sympy,mafiya69/sympy,shipci/sympy,atsao72/sympy,grevutiu-gabriel/sympy,debugger22/sympy,abhiii5459/sympy,Mitchkoens/sympy,lidavidm/sympy,sunny94/temp,Vishluck/sympy,asm666/sympy,meghana1995/sympy,AkademieOlympia/sympy,iamutkarshtiwari/sympy,sampadsaha5/sympy,wyom/sympy,Davidjohnwilson/sympy,ga7g08/sympy,lidavidm/sympy,yukoba/sympy,Gadal/sympy,jamesblunt/sympy,AkademieOlympia/sympy,sampadsaha5/sympy,diofant/diofant,jaimahajan1997/sympy,kevalds51/sympy,garvitr/sympy,kmacinnis/sympy,jbbskinny/sympy,yukoba/sympy,ahhda/sympy,souravsingh/sympy,MechCoder/sympy,maniteja123/sympy,sunny94/temp,postvakje/sympy,lindsayad/sympy,AkademieOlympia/sympy,abhiii5459/sympy,jbbskinny/sympy,saurabhjn76/sympy,cswiercz/sympy,bukzor/sympy,sampadsaha5/sympy,ahhda/sympy,lidavidm/sympy,wanglongqi/sympy,postvakje/sympy,abloomston/sympy,kumarkrishna/sympy,madan96/sympy,cswiercz/sympy,Sumith1896/sympy,Davidjohnwilson/sympy,rahuldan/sympy,ChristinaZografou/sympy,yashsharan/sympy,VaibhavAgarwalVA/sympy,sahmed95/sympy,drufat/sympy,vipulroxx/sympy,hargup/sympy,jbbskinny/sympy,yukoba/sympy,oliverlee/sympy,meghana1995/sympy,skirpichev/omg,grevutiu-gabriel/sympy,Designist/sympy,VaibhavAgarwalVA/sympy,Shaswat27/sympy,mcdaniel67/sympy,Davidjohnwilson/sympy,toolforger/sympy,iamutkarshtiwari/sympy,madan96/sympy,asm666/sympy,MridulS/sympy,AunShiLord/sympy,meghana1995/sympy,Mitchkoens/sympy,pandeyadarsh/sympy,yashsharan/sympy,hargup/sympy,jamesblunt/sympy,Vishluck/sympy,atreyv/sympy,bukzor/sympy,toolforger/sympy,toolforger/sympy,ga7g08/sympy,cccfran/sympy,rahuldan/sympy,sahmed95/sympy,kaichogami/sympy,grevutiu-gabriel/sympy,Arafatk/sympy,mafiya69/sympy,yashsharan/sympy,Designist/sympy,chaffra/sympy,Sumith1896/sympy,pbrady/sympy,AunShiLord/sympy,sahmed95/sympy,pandeyadarsh/sympy,atreyv/sympy,Sumith1896/sympy,garvitr/sympy,wyom/sympy,Titan-C/sympy,skidzo/sympy,Arafatk/sympy,Curious72/sympy,souravsingh/sympy,MridulS/sympy,Titan-C/sympy,iamutkarshtiwari/sympy,pbrady/sympy,Shaswat27/sympy,drufat/sympy,kaichogami/sympy,jerli/sympy,ChristinaZografou/sympy,moble/sympy,emon10005/sympy,chaffra/sympy,kumarkrishna/sympy,MechCoder/sympy,kaushik94/sympy,shikil/sympy,MechCoder/sympy,Vishluck/sympy,shipci/sympy,abloomston/sympy,cswiercz/sympy,wyom/sympy,dqnykamp/sympy,atreyv/sympy,ChristinaZografou/sympy,VaibhavAgarwalVA/sympy,farhaanbukhsh/sympy,amitjamadagni/sympy,skidzo/sympy,sunny94/temp,pbrady/sympy,mcdaniel67/sympy,Curious72/sympy,atsao72/sympy,liangjiaxing/sympy,jerli/sympy,Mitchkoens/sympy,jamesblunt/sympy,Shaswat27/sympy,aktech/sympy,postvakje/sympy,liangjiaxing/sympy,shikil/sympy,saurabhjn76/sympy,mafiya69/sympy,moble/sympy,MridulS/sympy,beni55/sympy,dqnykamp/sympy,pandeyadarsh/sympy,cccfran/sympy,debugger22/sympy,vipulroxx/sympy,kaushik94/sympy,cccfran/sympy,garvitr/sympy,vipulroxx/sympy,rahuldan/sympy,madan96/sympy,Designist/sympy,saurabhjn76/sympy,ahhda/sympy,abloomston/sympy,wanglongqi/sympy,hargup/sympy,hrashk/sympy,liangjiaxing/sympy,asm666/sympy,jaimahajan1997/sympy,debugger22/sympy,kmacinnis/sympy,Arafatk/sympy,farhaanbukhsh/sympy,hrashk/sympy,kevalds51/sympy,maniteja123/sympy,kevalds51/sympy,kaichogami/sympy,kaushik94/sympy,shikil/sympy,aktech/sympy,sahilshekhawat/sympy,drufat/sympy,aktech/sympy,souravsingh/sympy,oliverlee/sympy,hrashk/sympy,jaimahajan1997/sympy,sahilshekhawat/sympy,atsao72/sympy