Makes add_*() return Entry (instead of the hash)
Merge branch 'master' into 'python3'

Conflicts:
	tests/test_api.py
Renames base* to *_types in compat.py

* basestring -> string_types
* baseint -> int_types