Merge remote-tracking branch 'matiu/feature/virtual-methods-to-pull-data-from-bitcoind' into feature/p2p-import
p2p block and transaction importing
Merge branch 'master' of github.com:bitpay/mystery into feature/p2p-import

Conflicts:
	app/controllers/transactions.js
	app/models/Transaction.js
	config/env/development.js
	lib/Sync.js
	test/model/block.js
jsbeautify
Merge pull request #19 from maraoz/feature/p2p-import

p2p block and transaction importing