clang-format updates

Run with clang-format-6.0 and update to latest .clang-format
as listed in the docs repository.

Change-Id: I40fb686cc66adf56b2c1b5277ac1c44b64b89349
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/callout.cpp b/callout.cpp
index 7c0310e..eb26d64 100644
--- a/callout.cpp
+++ b/callout.cpp
@@ -12,16 +12,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "config.h"
+
+#include "callout.hpp"
+
+#include "dbus.hpp"
+
 #include <cereal/archives/binary.hpp>
 #include <cereal/types/string.hpp>
-#include <cereal/types/vector.hpp>
 #include <cereal/types/tuple.hpp>
+#include <cereal/types/vector.hpp>
 #include <experimental/filesystem>
 #include <fstream>
 #include <phosphor-logging/log.hpp>
-#include "callout.hpp"
-#include "config.h"
-#include "dbus.hpp"
 
 CEREAL_CLASS_VERSION(ibm::logging::Callout, CALLOUT_CLASS_VERSION);
 
@@ -181,5 +184,5 @@
 
     return true;
 }
-}
-}
+} // namespace logging
+} // namespace ibm