Merge pull request #3 from andrewor14/cleanup

Patrick's comments
Fixed compilation errors.
Fixed failing BroadcastSuite unit tests by introducing blocking for removeShuffle and removeBroadcast in BlockManager*
Fixed bug and adding unit test for removeBroadcast in BlockManagerSuite.
Fix tests and style