Fixes broken Docker build

The build was missing various needed packages, which were being installed, but in a later step. Also, cleans up the Dockerfile to be smaller and more readable, less redundant in places.