Merge branch 'master' into install

Conflicts:
	lib/cdist/config.py
	lib/cdist/path.py

Merged changes from config.py to config_install.py

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>

lib/cdist/config.py

@@ -24,7 +24,9 @@ import datetime
 import logging
 log = logging.getLogger(__name__)
 
+<<<<<<< HEAD
 import cdist.config_install
+>>>>>>> master
 
 class Config(cdist.config_install.ConfigInstall):
     pass
@@ -35,6 +37,9 @@ def config(args):
 
     time_start = datetime.datetime.now()
 
+    os.environ['__remote_exec'] = "ssh -o User=root -q"
+    os.environ['__remote_copy'] = "scp -o User=root -q"
+
     for host in args.host:
         c = Config(host, initial_manifest=args.manifest, home=args.cdist_home, debug=args.debug)
         if args.parallel: