ppc: merged conformal/master, app up and syncing

I have no access to mably/btcjson to complete merge - please fix it @mably :)