- update the style guide to require braces around blocks - add a clang-format file that is pretty close to the astyle configuration