Merge branch 'master' of https://github.com/dims/heroku-buildpack-php-tyler

Conflicts:
	bin/compile
Merge branch 'master' of https://github.com/dims/heroku-buildpack-php-tyler