Fixing bugs reported by Vaibhav Bajpai.
Merge branch 'master' of github.com:vbajpai/happy
Documented the experimental pump output format.