updating to respect the project's conventions wrt. import splitting, updated hg's default branch name to tip