Getting ready for logsum
Merge branch 'master' of https://github.com/dlwh/puck