Upgrade to github-pages 21

Upgrade to github-pages 21 (Jekyll 2.2.0) and modify pages to use
defaults for layout