Integrating new Stage Pi logic into the system

[hamishmb]

Okay, seems fair.

I think probably a fair amount of the deficiencies are in my unit tests to be fair - wasn't blaming you for the change or anything

It seems a bit unlikely that I'll have time to spend on the tests, but I guess the system is working in-situ right now so it's not too big of a deal.

[hamishmb]

Okay, all ready for deployment on Thursday and version bumped to 0.12.0