Install docker on Ubuntu 14.04.1 LTS (trusty)
Fix bad merge
Comment overridable properties
Add python pip
Merge pull request #15 from AlbanAndrieu/master

Add docker.io for Ubuntu 14.04.1 LTS (trusty)