Cleaning up Macro docs
Merge pull request #1912 from jwarwick/macro_docs

Cleaning up Macro docs