modify Vagrantfile
Merge branch 'master' into work

Conflicts:
	Vagrantfile
merge branch master
update ruby
Merge branch 'work'
modify .kitchen.yml
Merge branch 'work'