Merge branch 'master' of https://github.com/akkartik/carp
style cleanup: trailing whitespace; space before function params