Simplify comment parsing
Import better CLI code from Hoedown
Merge remote-tracking branch 'origin/master'