fix BP env arg dir detection
Merge branch 'develop' into hhvm

Conflicts:
	bin/compile
drop debug output