Some refactoring for using vagrant with chef