Add word-movement for iTerm2
Merge git config values from work