Update to latest web-mode
Update php-mode to current master