vagrant stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vagrant/machines/default/virtualbox/action_provision
	.vagrant/machines/default/virtualbox/action_set_name
	.vagrant/machines/default/virtualbox/id
	.vagrant/machines/default/virtualbox/index_uuid
	.vagrant/machines/default/virtualbox/synced_folders