Updated for 14.04 / Docker 1.0