Only wrap comments in code, not code itself
Update clean-aindent
Merge remote-tracking branch 'origin/master'