tweak trigsimp

- make sure c is in match result
- break loop if expression is unchanged
Merge pull request #1747 from smichr/3609

tweak trigsimp