merge work bashrc. extra git aliases
vimi works