Move autostart apps to .Xsession
bashrc: Add z and lock aliases
vim-templates: Update C templates
gitconfig: Disable annoying mergetool prompt and enable autosquash
gitconfig: Add merge-test alias
vimrc: Add markdown autocmds
bashrc: Enable vi-style editing