Standardize containers on WORKDIR /app
Standardize install of pip 1.5.4.
Merge pull request #663 from opdemand/dockerfile-makefile-cleanup

Dockerfile cleanup