Merge pull request #1 from unified-diff/master

Update fork
Fix name of Bitcoin talk
Merge pull request #85 from warrenseymour/master

Fix name of Bitcoin talk