Merge branch 'master' of https://github.com/ClaudiuC/heroku-buildpack-hhvm

Conflicts:
	bin/compile
Merge branch 'master' of https://github.com/ClaudiuC/heroku-buildpack-hhvm

Conflicts:
	bin/compile