small fixes to ansible provisioning and Vagrant
Merge remote-tracking branch 'origin/master'

Conflicts:
	provisioning/playbooks/ruby.yml