Merge branch 'limitfree' of /Users/gavin/src/integration_btc