Update Dockerfile
Merge branch 'master' into dockerfiles

Conflicts:
	docpad/Dockerfile