Revert "Merge pull request #990 from srawlins/revert-977"

This reverts commit abd650202e94fe95efe93afc4ae37581e98aab51, reversing
changes made to dd620c2c4782b9e94bc7024989f21ccf81b2d5b8.
Remove whitespace after metadata hyphens
Merge pull request #994 from srawlins/try-jekyll-2-again

Try jekyll 2 again