Merge pull request #1642 from Kenneth-T-Moore/bench

Fix for mysterious swapping derivatives
Smarter grouping of differentiable islands
one more test