Use current user's uid for NFS exports
Emit 'vagrant-mounted' on Ubuntu in mount_virtualbox_shared_folder capability

Also includes the same, but commented out, for mount_nfs capability
Add nfs mount option to puppet provisioner

This mimics the equivalent feature from the chef_solo provisioner, and
mounts the puppet manifests and modules with NFS. Doing so can greatly
shortens the time of a puppet run if you have many .pp files.

Enabling this is optional. Virtualbox's (or any other provider's) shared
folders method stays the default. A typical usage would look like this:

    config.vm.provision :puppet do |puppet|
        puppet.manifests_path = "puppetmaster/manifests"
        puppet.module_path = ["puppetmaster/modules"]
        puppet.manifest_file  = "site.pp"
        puppet.nfs = true
    end

This fixes #1308.
update CHANGELOG
hosts/bsd: nice error if can't read exports file [GH-2038]
Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user

Conflicts:
	plugins/hosts/arch/host.rb
	plugins/hosts/bsd/host.rb
	plugins/hosts/linux/host.rb
	templates/nfs/exports.erb
	templates/nfs/exports_freebsd.erb
	templates/nfs/exports_linux.erb
Update CHANGELOG
hosts/bsd: proper NFS prune sed syntax
hosts/linux: fix NFS prune regex
core: support "mount_options" for arbitrary mount options [GH-1029]
core: note backwards incompat in code
Update CHANGELOG
core: Arbitrary NFS options with nfs_options [GH-1029]
Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support

Conflicts:
	CHANGELOG.md
	plugins/provisioners/puppet/provisioner/puppet.rb
Bump version
guest: Remove dead code
Merge pull request #1717 from toretore/master

guests/ubuntu: Emit Ubuntu Upstart 'vagrant-mounted' (regression)
guests/ubuntu: enable the new mount_nfs stuff
Update CHANGELOG
Merge pull request #2107 from fgrehm/remove-dead-code

core: Remove dead code from Guest