Merge branches 'master' and 'master' of https://github.com/avaus/teletubby-heart
Test_server renamed to staging, configs now point to new production and staging addresses.