Fixed doc typos in Macro
Merge pull request #1529 from jwarwick/macro_typos

Fixed doc typos in Macro
Only raise on local macro conflicts if it was previously defined
Stop checking for matches once we reach a fun
Fix shadowing warning in case with function, closes #1524
Fix String.contains? not raising on non-string arg