Expand conf namespace

Put rest of conf.hpp in the conf namespace. This is
largely a sed replace, and wrapping from_json in
conf namespace as it failed to build.

Change-Id: I9fe5c7b2fface44618c43af2367035afc39bcb64
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/conf.hpp b/conf.hpp
index 14e1cc9..9d65154 100644
--- a/conf.hpp
+++ b/conf.hpp
@@ -9,8 +9,8 @@
 
 namespace conf
 {
+
 constexpr int64_t inheritValueFromDbus = std::numeric_limits<int64_t>::lowest();
-} // namespace conf
 
 /*
  * General sensor structure used for configuration.
@@ -58,3 +58,5 @@
 };
 
 using PIDConf = std::map<std::string, struct ControllerInfo>;
+
+} // namespace conf