MAINT: remove leftover check for Python <= 2.5.  Some cleanups of comments.
Merge pull request #2783 from rgommers/cleanup

MAINT: remove leftover check for Python <= 2.5.  Some cleanups of comments