Merge branch 'wip'
Merge branch 'wip'
Added php debugger
Merge branch 'wip' into php
Reflect the better plugin organisation for php specific ones
Replaced Command-T with CtrlP
Merge branch 'php' into wip