UncleBlocks bug - only headers should be parsed (not full blocks)
PeerDiscovery new details added
Make JSON dump compatible with pyethereum and VM trace dump with c++ and Go
Add missing property and log-settings
Merge pull request #79 from nicksavers/master

Better debugging options and other minor fixes
Merge branch 'master' of https://github.com/ethereum/ethereumj
Fix for consensus block 1501
Merge pull request #81 from nicksavers/master

Fix for consensus block 1501
Merge branch 'master' of https://github.com/ethereum/ethereumj
Unit test ofr Nicks last PR
Should not be in Git
Slight fix
added database folder to .gitignore