temporary PR for funding rules against new payday

This is a PR of the 1063-funding-rules branch against payday-rewrite-5. Once we land #2579 we should go back to #2299 for #1063.

[IRC](https://botbot.me/freenode/gittip/2014-08-01/?msg=18997466&page=1)