Dockerfile fixes.
Merge pull request #83 from mrunalp/dev/dockerfile_fixes

Dockerfile fixes.