More wording changes on version conflicts
v1.5.0
Update CHANGELOG
Up version for dev
ST3 Vagrantfile syntax highlighting
Update contrib/README & bash shebang line
Merge pull request #3090 from adamlazz/contrib-st3

contrib: Sublime Text 3 Ruby syntax association for Vagrantfiles
website/www: release blog post
website/docs: update gemfile.lock
website/www: update index
Add SmartOS detection and mount plugins
website/www: 1.5 post: a very pleasant typo fix
kernel/v1: provisioner upgrade works properly [GH-3092]
core: EINVAL is not a metadata URL
Update CHANGELOG
core: Setup the tmp_path before calling setup_home_path [GH-3095]
website/www; simplify homepage
Nit-picky grammer making it easier to read.
Merge pull request #3097 from jjshoe/patch-1

website/docs: Nit-picky grammer making it easier to read.
Dummy communicator runs :test correctly