Fix to_s for MacroStrings including macros.  Remove method from IPAddressWrapper.  Add a few more specs.