pull in markos changes, minor tweaks to yaml stuff

1 files changed, 7 insertions, 0 deletions

diff --git a/examples/settings.py b/examples/settings.py
index 1537c5f8..2eab2cfa 100644
--- a/examples/settings.py
+++ b/examples/settings.py
@@ -89,6 +89,12 @@ TEMPLATE_DIRS = (
     # Don't forget to use absolute paths, not relative paths.
 )
 
+# for loading initial data
+##SERIALIZATION_MODULES = { 
+  #  'yml': "django.core.serializers.pyyaml"
+
+#} 
+
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -104,6 +110,7 @@ INSTALLED_APPS = (
     'objectstore',
     'pygments_api',
     'blogpost',
+    'permissionsexample',
 )
 
 import os