Changes for includes path, better processing of matching paths
Merge branch 'master' of github.com:cwi-swat/php-analysis