initStateFromDeck(): do not accept potentially contradicting ways to set the initial condition

i.e. PRESSURE and EQUIL are now considered mutually exclusive...
Merge pull request #511 from andlaus/initStateFromDeck_reverse_PRESSURE_and_EQUIL

initStateFromDeck: reverse the priorities of the PRESSURE and EQUIL keywords