Small refactor
Merge branch 'bak' into dev
Remove conflicting code from watch.js
Merge branch 'vim' into dev