Merge branch 'Laptop' of github.com:slagtermaarten/dotfiles into Laptop
Added vi keybindings in inputrc
Merge remote-tracking branch 'origin/NKI' into Laptop