#1035: Cleanup and fix composer detection.
Merge branch 'master' of https://github.com/opi99/phing