Replace long with integer_types, refs #38
Replace basestring with string_types (mostly), refs #38.
Merge branch 'master' into issue38_11