Merged Tom's changes into my HEAD

Merge commit '4248e8ca2f83e33137e3dce90c939f7b21e355a4'; commit '7ec77cf125ac21e7a6c0ef7aa99ab84c71c680d1'

diff --cc src/config.cpp
Simple merge

diff --cc src/config.h
index d287917,e6cd76f..8fe49bf
--- 1/src/config.h
--- 2/src/config.h
+++ b/src/config.h
@@@ -26,11 -24,10 +26,12 @@@
  #include "ods.h"
  
  namespace po = boost::program_options;
 +namespace fs = boost::filesystem;
 +
  using namespace std;
  
- class Config{
+ class Config
+ {
  private:
      po::options_description *opt_desc_cmd;
      po::options_description *opt_desc_conf_main;