Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Remove /usr/local/bin/docker
Merge pull request #227 from chooper/issue226_vagrant

Remove /usr/local/bin/docker from Vagrant VirtualMachine image during provisioning