Docker now does expand ENV variables

Tested this with Docker 1.3.0 and it works fine.
Merge pull request #1453 from nashamri/patch-1

Docker now does expand ENV variables