Refactor 'jekyll serve' command.
Merge pull request #2269 from jekyll/fix-up-serve