Merge branch 'master' of github.com:drmikecrowe/dokku-buildpack-php

Conflicts:
	bin/compile
Merge branch 'master' of github.com:drmikecrowe/dokku-buildpack-php