Merge remote-tracking branch 'gh/wip-config'

diff --cc ceph_deploy/config.py
Simple merge

diff --cc ceph_deploy/gatherkeys.py
index 2407bfe4d9ded02848aa107071d82402b557d884,9c457e9930baac9312f7dea996500de9730e7aea..0557cb9ef9ffdb048e697fd6e344ae447fa06598
--- 1/ceph_deploy/gatherkeys.py
--- 2/ceph_deploy/gatherkeys.py
+++ b/ceph_deploy/gatherkeys.py
@@@ -3,9 -4,9 +4,8 @@@ import loggin
  
  from cStringIO import StringIO
  
 -from . import exc
  from .cliutil import priority
- 
+ from . import misc
  
  log = logging.getLogger(__name__)