merge inconsistent wallets
merge wallet cflt management with master
bump the manifest
remove change listing in receive address
Fix default port for production
Fix default prod port in INSTALL.md
Merge pull request #58 from WyseNynja/patch-1

Fix default port for production in INSTALL-OSX.md
Merge pull request #59 from WyseNynja/patch-2

Fix default prod port in INSTALL.md
Merge pull request #1 from kyledrake/master

Update master