Update vagrantfile to clean up some of the additions
Merge branch 'tb/coreos-kubernetes' of github.com:geauxvirtual/coreos-vagrant into tb/coreos-kubernetes