add back some bits
Merge branch 'master' of https://github.com/betfair/cougar