A number of issues for includes resolution; now taking different approach, but that will be based in part on some of these modifications
Merge branch 'master' of github.com:cwi-swat/php-analysis