'use' statements CS fixes.
Refactored the integration with Doctrine2 to be more succinct. Also added state checks during persistence to avoid uncessary updates/inserts.