GitLab

Caused by the dwoo upgrade. While I was there, cleaned up some
whitespace.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>