Got rid of some macros and fixed some lint.

YAY. Gonna bike to CHS now.
Merge pull request #8 from OlyCow/development

Got rid of some macros and fixed some lint.