Adds support for using select.poll() if it's available

    Move a 'map is None' test out of an else branch and into the right place