Refactoring

This is a small release that includes some minor code adjustments. The most noteworthy is that the entangle method of photons and states was changed to combine_state; this is to better illustrate what is actually happening in the code (no entanglement but simply combining state objects. There were also a few bug fixes, mainly with regards to the state manager. As per usual a full list of changes may be found in CHANGELOG.md.