Clean up horizon some more

Some tasks didn't have names. Flush handlers early to avoid an immediate
http restart.
Merge pull request #632 from blueboxgroup/cleanup-horizon-more

Clean up horizon some more