Remove centos64 from Vagrantfile
Merge branch 'vm'