Updated for most recent DocPad version
Merge branch 'master' of github.com:sergeche/docpad-plugin-frontend

Conflicts:
	package.json