sync with peer only after ident.
Merge branch 'master' into consensus-bugfixes

Conflicts:
	lib/client.js
Merge pull request #1 from martindale/consensus-bugfixes

Convert Identity to Allow Callbacks