Fix a few minor issues with the Dockerfile (both for buildability and cacheability)
Merge pull request #532 from tianon/minor-dockerfile-tweaks

Fix a few minor issues with the Dockerfile (both for buildability and cacheability)