move stuff around to make macros.h easier to read.
Merge branch 'master' of https://github.com/jsedoc/Penn-CNS-Chat