Merge pull request #91 from mastercoin-MSC/master

Sync to Master
remove socket.io until needed/used
Merge branch 'master' of https://github.com/achamely/omniwallet
Merge pull request #1086 from achamely/master

Cleanup Dependancies
Update and add additional tesnet capabilities
update form check
Refactor - add the transaction as return value to prepareTransaction
Refactor - add privkey to TrasactionManager
Refactor - add self reference
Refactor - track address and keys inside the TransactionManager instance.
Refactor - add support for testnet
Proper variable assignment
boolean check update
Change testnet comparison check
cleanup uwsgi reload, only check base python files
Merge pull request #1087 from achamely/testnet

Update and add additional tesnet capabilities
Merge pull request #1088 from Nevtep/arch-refactor

Arch refactor
Merge branch 'master' of github.com:mastercoin-MSC/omniwallet into tx21-form

Conflicts:
	www/js/app.js