Backport some changes from production.
Merge branch 'master' of github.com:anderbubble/ikiwiki-bootstrap