Merge branch 'master' of github.com:botify-labs/python-simple-workflow

Conflicts:
	swf/__init__.py

Author: Oleiade

swf/models/decision/marker.py

@@ -22,5 +22,7 @@ def record(self, name, details=None):
         :type   details: str
         """
 
-        self['markerName'] = name
-        self.update_attributes({'details': details})
+        self.update_attributes({
+            'markerName': name,
+            'details': details
+        })