[i3] Default is tabbed, damnit
[vim] Ugly fix for puppet not being detected