Allow hyphens in kwargs to inclusions and block helpers

(and other characters)