Rename partition_cell_states to cell_states to match with other names.
Fix indent and unify imports.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1095 71dcc9de-d417-0410-9af5-da40c76e7ee4