--- a/piecrust/configuration.py	Mon Aug 11 22:36:36 2014 -0700
+++ b/piecrust/configuration.py	Mon Aug 11 22:36:47 2014 -0700
@@ -89,7 +89,7 @@
 
 
 def _recurse_merge_dicts(local_cur, incoming_cur, parent_path, validator):
-    for k, v in incoming_cur.iteritems():
+    for k, v in incoming_cur.items():
         key_path = k
         if parent_path is not None:
             key_path = parent_path + '/' + k
@@ -113,7 +113,7 @@
 def parse_config_header(text):
     m = header_regex.match(text)
     if m is not None:
-        header = unicode(m.group('header'))
+        header = str(m.group('header'))
         config = yaml.load(header, Loader=yaml.BaseLoader)
         offset = m.end()
     else: