Switch to Dockerfiles
Merge branch 'master' into dockerfiles

Conflicts:
	docpad/Dockerfile
Merge pull request #13 from RobLoach/dockerfiles

Switch to Dockerfiles