updated config to handle new source locations, also fixed some php <5.3 issues with arrays references