move clean_key_name to reshape.py
Merge branch 'master' into py2