Merge branch 'merge-gh-221' into merge-pull-221
BUG: fix range/xrange issues due to removal of 2to3.
Merge pull request #420 from pv/fix-warnings

BUG: fix integer divisions + complexwarnings
ENH: interpolate: refactor interp1d to use the same axis handling mechanism as the polyint interpolators