Simplify hy Dockerfile with less manual directory munging

Let your tools do all the "hard" work! :)
Merge branch 'master' into pr/1