Merge pull request #31 from ledgersmb/master

bringing up to date
Fixing syntax error
Deleting bad test.  The problem apparently is that the test was searching for an unapproved payment which shouldn't succeed.  May add new tests as we do the rewrite.

--HG--
extra : source : a5e7b72ca30da5130570428bc80a8910add24645
A COGS fix

--HG--
extra : source : 6b6c5e58bd489539a34606034ab793905474e778
One more cogs fix

--HG--
extra : source : cda8362ca9cdaa55b4c94018f918dcf2d8900d79
Applying Istvan's fix

--HG--
extra : source : f3a12b2da2ad2c8e2693c3ebfaf3c92334f89539
Merge pull request #180 from einhverfr/master

merging fixes for rc3 for 1.4