deis/deis — pull request #799 by carmstrong (2014-04-22 20:37:08+00:00)
Title: refactor(Vagrantfile): merge Vagrantfiles and update to upstream

This commit merges the Makefiles and Vagrantfiles, and supports
both a 1-node and n-node local cluster with the same files. Also,
the user-data and override-plugin have been updated to be more
closely in line with upstream. Also updates README with additional
instructions.

closes #760, #747