Update bootstrap symantecs
CFEngine 3.5 bootstrap removed the policy-server option
http://cfengine.com/blog/cfengine-is-very-easy-to-install-and-now-so-is-bootstrapping
Merge branch 'master' of git://github.com/mitchellh/vagrant
Add ability to specify custom cfengine pacakge name
This is intended to allow adding support for installing CFEngine
Enterprise.
Merge pull request #1920 from nickanderson/feature/custom_cf_package_name

Feature/custom cf package name