Closes #1256: I reworded our style docs to be more explicit about the style we're aiming for and how it is changed (or isn't).
