Using our own phpunit, rather than travis'
Ensuring we'll get the dev dependencies.
Merge branch 'master' into hhvm

Conflicts:
	.travis.yml