Subtree merge of coreos/coreos-vagrant@94bcda03f678b561e6f60039df254abd2b3ad93c
Subtree merge of coreos/coreos-vagrant@94bcda03f678b561e6f60039df254abd2b3ad93c

errordeveloper/weave-demos,errordeveloper/weave-demos,errordeveloper/weave-demos,errordeveloper/weave-demos