The first commit is just whitespace cleanup.
The second commit is regenerating civix and updating the docs