added speed test, and also added default values for settings in Merkle.
Merge branch 'devel'
Merge branch 'master' of github.com:storj/heartbeat
PEP8 changes
fixed some warnings due to initialization order and a potentially uninitialized value.
Merge pull request #26 from wiggzz/master

Pulling in some small changes... removing some compiler warnings, added a speed test.