temporarily removed annotations which cause conflicts
minor
merge and expect non-str cached values
less stringent type checking in conversion
Merge branch 'master' into local
no longer need annot in str+ logging
Merge branch 'local' into redis
return_study takes SHA or branch