Remove uses of iterkeys
Fix references to dict.iteritems and dict.itervalues