Merge xinitrc and fix some stuff there
Add matchit
Update all submodules
: