Do not join the Guard thread.  Sleep instead.

Commit b650c8bd in the listen gem (used by Guard) causes an issue
where the Guard thread never actually exits so site-tool just hangs
forever.  To fix it, we'll start the Guard thread and just sleep
while it is running.  This technique is what Guard itself uses in
cli.rb.
Upgrade to Jekyll 2.1.