JS console tweaks
Updating to latest PHP-mode
Merge remote-tracking branch 'origin/master'