merge from coreos-vagrant
no more automatic docker pulling