Updated php and xdebug
Missed one
Merge pull request #425 from GrahamForks/php

Updated php and xdebug
Update maven to 3.2.5

3.2.3 does not exist any more
Merge branch 'master' of github.com:travis-ci/travis-cookbooks
Update default Node.js to 0.10.35
Install grunt-cli for Node.js 0.8 and up

Fixes https://github.com/travis-ci/travis-ci/issues/1064
Avoid running rm if files do not exist

Avoid looking at failure message altogether
Merge branch 'master' into ha-feature-vagrant