Gitignore
Move macro defs to top