renamed variable (name already used in context)
Merge branch 'master' of github.com:Siacoin/Sia
Added HeartbeatTransaction and related functions
Merge github.com:c00w/Sia into Heartbeat

Conflicts:
	src/swarm/swarm.go
Added unmarshaling ability to HeartbeatTransaction
MarshalString for HeartbeatTransaction now uses MarshalTransaction.
Modified UnmarshalTransaction to recognize the HeartbeatTransaction
struct (using "Heartbeat" as a temporary identifier, change if
confusing).
Fixed syntax errors
Merge branch 'master' of github.com:c00w/Sia into Heartbeat
Merge branch 'master' of github.com:c00w/Sia into Heartbeat

Conflicts:
	src/swarm/swarm.go
Merge branch 'master' of github.com:c00w/Sia into Heartbeat
Started StateSteady, minimally functional
Merge pull request #1 from Jonbeek/Heartbeat

HeartbeatTransaction