Use six.string_types instead of basestring.
Merge pull request #761 from berkerpeksag/fix-string-types

Use six.string_types instead of basestring.