revert httpjson regression
Merge pull request #25 from rogpeppe/026-cmars-004-bakeryfix

bakery: do not use undefined methods
Merge remote-tracking branch 'rogpeppe/master'

Conflicts:
	httpbakery/discharge.go