Merge the count-fix branch where I've been doing some dangerous stuff. Most notably, you'll need to edit .vagrant in existing projects, as naming/numbering has changed. puppet-drush is now a git sub-module. Now uses latest drush-hosts commands: 'drush hosts-add' and 'drush hosts-remove'.