ARMORY-121 Running all Unit Tests failing Non-Deterministically
Still failing on the second test but I'm making progress
Minor edits
ARMORY-118 - Implement import and export of root public keys (watch-only wallets) - Initial delivery.
ARMORY-118 - Code cleanup.
ARMORY-125 - Make some changes so that armoryd actually runs again.
ARMORY-125 - Remove a call that was expecting a GUI context.
ARMORY-121 Running all Unit Tests failing Non-Deterministically
ARMORY-121 Running all Unit Tests failing Non-Deterministically
Merge branch 'andy-devel' of github.com:etotheipi/BitcoinArmory into andy-devel

Conflicts:
	test/ArmoryDTiabTest.py
Fixed import
ARMORY-121 Running all Unit Tests failing Non-Deterministically
ARMORY-125 - More armoryd cleanup. Note that there are now two JSON-RPC libraries in the code: One for general JSON-RPC functionality (txjsonrpc) and Jeff Garzik's Bitcoin-specific library (bitcoinrpc_jsonrpc). Both are required in order for armoryd to work, and I didn't want to "cross the streams" and dump everything into one directory.
Merge branch 'devel' into doug-devel

Conflicts:
	armoryd.py
	armoryengine/PyBtcWalletRecovery.py
Resolve a merge derp.
ARMORY-121
Running all Unit Tests failing Non-Deterministically
Merge branch 'devel' into doug-devel
Updated the TiaB block Height
Removed the test directory to be replaced with a sub-module
Added Test Submodule
Merge branch 'devel' into doug-devel

Conflicts:
	test
	test/PyBtcAddressTest.py