MAINT: remove lazy import stuff from lib.six.  Closes gh-2764.
Merge pull request #2803 from rgommers/issue-2764-sixmoves

MAINT: remove lazy import stuff from lib.six