Clean up the Project model to reduce conflicts

This re-orders some code in Project so the method order matches EE's version of this model, and to make it easier to alter behaviour of Project#reset_cache_and_import_attrs.