FIX:basing issues Restart
FIX: add changes to test_source_estimate
Merge pull request #1366 from dgwakeman/annot_semantics

Annot semantics
ENH: Add hashing
WIP ENH: Add hashing
FIX: Unicode
FIX: Py3k sorting
FIX: Py3k
FIX: Tests
FIX: Fix diff fun
FIX: Fixes
FIX: More conservative default for object_hash
FIX: Fix encoding