New meta and keywords to fit with Fanny's observations
Merge branch 'source' into per-page-meta-descriptions

Conflicts:
	docpad.coffee
Merge pull request #4 from metidia/per-page-meta-descriptions

O'right, I'll deploy that =)