Change repo strategy to use squashed subtrees, to make rebasing easier(?)