Merge pull request #9 from vikramrajkumar/upstream

Fix compilation
Integrate miner into client + broadcast