replaced php54 by php55
Merge branch 'master' of https://github.com/manubo/vagrant
replaced php54 by php55