Add note about underscore/dash shadowing
Added docs for unquote and unquote-splice
Merge branch 'master' into pr/430