Removed duplicate entry.
Merge pull request #2167 from schlamar/patch-1

provisioners/chef: removed duplicate entry.
Put nfs opts setup in separate function and configured to be called by both generic linux and arch nfs_options.  Fixes undefined method join exception in arch
Merge pull request #2176 from deltaroe/master

hosts/linux: put nfs opts setup in separate function
core: fix NoMethodError in Vagrant.has_plugin? [GH-1736]
Updating for NFS Fix
Cleanup for Pull Request
Merge pull request #2189 from phinze/1736-fix-has-plugin-no-method-error

core: fix NoMethodError in Vagrant.has_plugin? [GH-1736]
Update issue reference on CHANGELOG
core: Allow strings to be used when checking for Guest capabilities
clarification: don't -> shouldn't
Call the rest of the middleware stack all the time.
add ansible.host_key_checking configuration parameter
need_configure should return true when master_config is defined as well.

This fixes #2204 and fixes saltstack/salty-vagrant#100
core: Report the proper invalid state when waiting for the guest machine to be ready
Merge pull request #2205 from jcockhren/fix_2204

provisioners/salt: need_configure should return true when master_config is defined as well.
Merge pull request #2203 from copperlight/ansible-host-key-checking

provisioners/ansible: add ansible.host_key_checking configuration parameter
Update CHANGELOG
Merge pull request #2200 from mikerowehl/virtualbox_destroy_unused_interfaces_fix

providers/virtualbox: call rest of destroy middleware stack
Merge branch 'master' of https://github.com/mitchellh/vagrant