docpad installed
Merge commit 'cadd80b37dc90de6c6e6e2b53859448dae727edf'

Conflicts:
	README.md