Make use of "six"

[jefftrull]

The Python six module supplies an "imap" we can use instead of the existing hacks.

[jefftrull]

Looks like there are some other (better?) alternatives: http://python-future.org/quickstart.html