Fixed git merge errors and fixed naming errors

Heartbeat is considered one word, and should be capitalized like one.
Completed SteadyState and fixed minor issues

StateSteady is completely untested, but it compiles... Also removed an
argument from NewHeartbeat because it wasn't being used, and filled in
the arguments for NewStateSteady in stateinformed.go.
Clear Heartbeat storage on handling of new Block
Fixes to StateSteady and Rendezvous Hash

StateSteady no longer feeds itself its Heartbeat and Blocks, but rather
waits for the NetworkMultiplexer. Furthermore, the key argument for
RendezvousHash now is useful.
Created test and kill mechanism for StateSteady
Added documentation and logging to StateSteady
Fixed StateSteady test

One issue was calling Die on a state that could possibly not have that
method. A Die method should be added to State interface, to allow for
easy transitions.
Switched storage of Heartbeats from list to map
Allows for recording of which host sent the heartbeat, and allows
rejecting of heartbeats from hosts which have sent their heartbeats for
the current block.
Fixed Stage2 init in initial Steady heartbeat
Modified constructor for StateSteady and usage in StateInformed to pass
secret string for first heartbeat.
Updated RendezvousHash key and seen host check

The rendezvous hash for selecting a block compiler now uses the DRNGSeed as its
key instead of the previous block id. StateSteady now checks whether it
has seen a heartbeat from a host before accepting it as the new
heartbeat (can modify so if received a heartbeat from a host that does
not match the heartbeat previously received, ignore it).
Updated statesteady test function calls
StateSwarmInformed.Die now takes a boolean value and NewStateSteady
takes a unique secretstring (set to the name of the blockchain host
for lack of a better setting). WARNING: This will almost certainly fail
if verification is done on the new heartbeat with the previous
heartbeats. Replacing the constructor for the Blockchain (private to the
test) should work.
Initialize Heartbeat map in constructor
Change source of storagemapping in Steady
Reduced waiting time of Steady test
Fix race condition in Steady test.
Update Informed to deal with non-trivial Steady

Also fixed issues with the Steady test cases. This is technically a
merge, but there were a large number of issues which needed to be fixed
as well, namely an over-reliance on the internals of StateInformed.
Merge pull request #28 from Jonbeek/StateSteadyMk2

Implemented StateSteady