Fix #344. Updates the stage process to step through stages
Merge branch 'master' of https://github.com/openfarmcc/OpenFarm into life-stages
Some cleaning up
Merge pull request #361 from simonv3/life-stages

Clean up life stages