All master changes merged with solvation.

I merged the latest master branch with your solvation branch. The simple and base reactor classes had changed a fair bit, so I replaced your liquid reactor with the updated simple (ideal gas) reactor, then re-played the changes required to turn it back into a liquid reactor. 
Some of this I had to re-work and change a bit. 
I think I got it working correctly though, for both simple and liquid.

This should be a straightforward fast-forward merge with your solvation branch.