Hy's dashes to python's underscores on keywords

   And test it
Merge branch 'keywords' into future