Merge remote-tracking branch 'telmich/master'

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

docs/changelog

@@ -7,6 +7,7 @@ next:
 	* New type: __pacman_conf_integrate: cdist compatible pacman.conf (Dominique Roux)
 	* Type __consul: Do not install unused package unzip (Steven Armstrong)
 	* Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong)
+	* Core: Support object ids '.cdist' (Nico Schottelius)
 
 
 3.1.13: 2015-05-16

docs/dev/logs/2014-05-06.object-marker

@@ -0,0 +1,14 @@
+Change object marker from .cdist to .cdist-TEMPNAME to allow using
+object ids that contain / are .cdist.
+
+Changes required:
+
+    cdist/emulator.py:
+        needs to know suffix/name
+    tests:
+        allow object id named /.cdist
+    tests:
+        many
+    cdist/config.py:
+        have suffix
+

docs/dev/logs/2015-02-22.allow_dot_cdist

@@ -0,0 +1,29 @@
+- locate code that references .cdist
+    - cdist_object.py
+- need to change code that handles objects?
+    - setup object marker
+        exec/local.py
+    - cdist/emulator.py
+        - need to know the marker name
+        - shell.py
+        - test/manifest/__init__.py
+        - core/code.py:
+        - core/manifest.py:
+        - core/manifest.py:
+    - list_object_names() needs to know the marker -- used BY:
+        - list_objects 
+            - cdist/test/cdist_object/__init__.py
+            - cdist/config.py
+        - cdist/test/cdist_object/__init__.py
+
+    - list_object_names
+        - needs to have object_marker
+
+- or modify object code to load name
+- setup a per-run random name
+    - local.py
+- use the per-run random name
+- create test
+
+    def __init__(self, cdist_type, base_path, object_marker=".cdist", object_id=''):
+