centos 6.5
Merge branch 'master' of github.com:jayjanssen/vagrant-percona

Conflicts:
	Vagrantfile.ebs_custom
	Vagrantfile.ms
	Vagrantfile.pxc
	Vagrantfile.pxc_multi_region
	Vagrantfile.single_node