Merge pull request #330 from aboe76/fix_deprecated_iteritems

fix #296 deprecated iteritems() and replace it with items()

salt/map.jinja

 {#-     This whole `'dict' in x.__class__.__name__` mess is a 
         workaround for the missing mapping test in CentOS 6's 
         ancient Jinja2, see #193  #}
-{%-     for k,v in b.iteritems() %}
+{%-     for k,v in b.items() %}
 {%-         if v is string or v is number %}
 {%-             do a.update({ k: v }) %}
 {%-         elif 'dict' not in v.__class__.__name__ %}