Fix merge conflicts. Add basic cloudformation support. Closes #111.

moto/iam/utils.py

@@ -0,0 +1,9 @@
+import random
+import string
+
+
+def random_resource_id():
+    size = 20
+    chars = range(10) + list(string.lowercase)
+
+    return ''.join(unicode(random.choice(chars)) for x in range(size))