Merge branch 'triceratops-refactor'
ZTS issues and test fixes
Misc test case fixes and memory issues.
Refactor tracing in preparation for another uber cool tracing handler.
Fixed initialisation issues with ZTS
Merge branch 'xdebug_2_2'
Merged pull request #124
Fixes a crash/memory read error with the tests/array_map-php55.phpt test.
Achievement unlocked: Named an OpenStreetMap server: Saphira is the new London tile cache.