Reconfigure for i3 again
Add shortcuts to ssh config
Update gitconfig with usable diff/merge tool
Reformat i3status bar