Lots of rewriting of `rebuild`.
Fix CodeMotion2.rebuild.
Undoing previous "fix" to `gather`.
Merge pull request #6 from jankner/1.x

1.x some fixes for codeMotion2