Merge in updated cantera

Change the way cantera composition is defined to make it cleaner and eliminate the need to create dummy reactants for things such as 'Air'