Update web-mode to current master
Add a few todo items