pdate Vagrantfile
Merge branch 'master' of https://github.com/f2brossi/ansible-apache-swift

Conflicts:
	Vagrantfile