Add support for remote shell provisioner script
Merge branch 'shell-provisioner-remote-script' of https://github.com/fgrehm/vagrant into fgrehm-shell-provisioner-remote-script

Conflicts:
	CHANGELOG.md
provisioners/shell: prefer "." over "::"

/cc @fgrehm
Add a file provisioner

Add a provisioner which will upload host files and directories to the
guest via the scp channel. This is useful for populating user specific
files into the guest. This is a rename from scpupload to file and updated
against master. [GH-1357]
website: add docs back to the main Vagrant repo
guests/fedora: use PEERDNS=no in static [GH-2111]
scripts: add website_push_docs
website/docs: add .buildpacks file
Only ignore the root Gemfile.lock
website/docs: bring in changes from docs.vagrantup.com
website/www: add www.vagrantup.com
scripts: website_push_www
Merge pull request #2112 from markpeek/markpeek-file

Add a file provisioner
Update CHANGELOG
Clarify statement on role files with chef-solo
Merge pull request #2115 from erichelgeson/patch-1

website/docs: Clarify statement on role files with chef-solo
website/docs: clarify roles