Make phpcs happier.
Support SHAs as version
Support oneline comments for single shas
Minor white-space fixes