Fix references to 'long'

For all instances of `(int, long)`, change to six.integer_types. For
all other references to `long`, change to `int` through lib2to3.

For #20