Align LHS and RHS changes. Put track/duration differences on RHS.
Fix tests.
Merge pull request #78 from mrmachine/align-changes

Align LHS and RHS changes. Put track/duration differences on RHS.