Maintain local changes
Improve git defaults
Fix tmux config