Merged in vim settings from main laptop