Cleaned up placement of macros. macros.tex has all the common ones, and main.tex has document specific ones.