Merge pull request #14 from wiggzz/devel

Improved back end to support JSON serialization via todict and fromdict methods
Revert "Improved back end to support JSON serialization via todict and fromdict methods"
Merge pull request #15 from Storj/revert-14-devel

Revert "Improved back end to support JSON serialization via todict and f...
merged devel to master
Revert "Merge pull request #15 from Storj/revert-14-devel"

This reverts commit c2771c41c635fbd28adf5cf6fdc10c8df7bdcc5d, reversing
changes made to 569109895fbefc2c31fb5b6401b8262ee6236003.
Merge branch 'devel'
Merge branch 'master' of github.com:wiggzz/heartbeat
Merge pull request #19 from wiggzz/master

Pulling in changes in preparation of merging to master.