Merge conflict
Updated aliases
Remove error code from bash prompt (was breaking)
Update leiningen profile
tig update
Removed i3
Removed zsh, my bane
Removed cd [tears in my eyes]