port in latest poole changes, update rems to ems
Merge branch 'master' of https://github.com/poole/lanyon
revert #36 because github pages doesn't use jekyll 2 yet