Moved salve.settings.config to salve.config

Rather than having a whole package devoted to settings, which does not properly
encapsulate the global execution context and other classifiable "settings", the
config package is exposed within the toplevel salve package. This is a clearer
breakdown. Config can be turned into a package if there is a call to do so in
the future.

salve/cli/deploy.py

@@ -11,7 +11,7 @@
 from salve.util.error import SALVEException
 from salve.util import locations
 from salve.block import manifest_block
-from salve.settings import config
+from salve import config
 
 
 def run_on_manifest(root_manifest, args):

tests/unit/block/__init__.py

@@ -3,7 +3,7 @@
 import os
 import mock
 
-import salve.settings.config
+import salve.config
 from salve.util.context import FileContext, ExecutionContext
 from salve.util.log import Logger
 
@@ -30,7 +30,7 @@ def mock_expanduser(string):
 with mock.patch('os.path.expanduser', mock_expanduser):
     with mock.patch('salve.exec_context', dummy_exec_context):
         with mock.patch('salve.logger', dummy_logger):
-            dummy_conf = salve.settings.config.SALVEConfig()
+            dummy_conf = salve.config.SALVEConfig()
 
 # must be set after conf is created, otherwise they will be overidden by
 # config initialization

tests/unit/cli/deploy_test.py

@@ -66,7 +66,7 @@ def compile(self):
             return MockAction()
 
     with mock.patch('salve.block.manifest_block.ManifestBlock', MockManifest):
-        with mock.patch('salve.settings.config.SALVEConfig', mock.Mock()):
+        with mock.patch('salve.config.SALVEConfig', mock.Mock()):
             deploy.main(fake_args)
 
     assert have_run['action_execute']

tests/unit/settings/config_test.py

@@ -8,7 +8,7 @@
 from tests.utils.exceptions import ensure_except
 from salve.util.error import SALVEException
 
-import salve.settings.config as config
+from salve import config
 
 _testfile_dir = pjoin(dirname(__file__), 'files')
 _homes_dir = pjoin(dirname(__file__), 'homes')