Merge pivot before cyclic imports force big file changes

[epost]

Thanks Ryan! I fixed the merge conflicts that have arisen since you contributed this in #147, so closing this.