Macro import is now part of stacks-tools

Including Johan's improvement