FIX: Change `itervalues`, `iteritems` to `values`, `items` to work on bo...

...th Python 2 and Python 3..