Merge in colms' style guide.