misc adjustments.
Merge branch 'master' of https://github.com/maxime01/btc

Conflicts:
	src/fx-api.c